summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-images/images/packagegroup-tdx-cli.bb3
-rw-r--r--recipes-images/images/packagegroup-tdx-graphical.bb2
-rw-r--r--recipes-images/images/packagegroup-tdx-qt5.bb4
-rw-r--r--recipes-images/images/tdx-reference-minimal-image.bb3
-rw-r--r--recipes-images/images/tdx-reference-multimedia-image.bb6
5 files changed, 18 insertions, 0 deletions
diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb
index f329401..4f9eebc 100644
--- a/recipes-images/images/packagegroup-tdx-cli.bb
+++ b/recipes-images/images/packagegroup-tdx-cli.bb
@@ -94,6 +94,9 @@ RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6ull = "\
mtd-utils-ubifs \
mwifiexap \
"
+RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6ull-emmc = "\
+ bmode-usb \
+"
RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx7 = "\
mtd-utils-ubifs \
"
diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb
index 4088c44..de9e381 100644
--- a/recipes-images/images/packagegroup-tdx-graphical.bb
+++ b/recipes-images/images/packagegroup-tdx-graphical.bb
@@ -51,6 +51,7 @@ GSTREAMER_MX6QDL = " \
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6dl = " ${GSTREAMER_MX6QDL}"
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6q = " ${GSTREAMER_MX6QDL}"
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_colibri-imx6ull = ""
+RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_colibri-imx6ull-emmc = ""
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx7 = " imx-gst1.0-plugin"
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx8 = " \
imx-gst1.0-plugin \
@@ -79,6 +80,7 @@ RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6q = " \
${IMAGE_INSTALL_OPENCL_IMX} \
"
RRECOMMENDS_packagegroup-gpu-tdx-graphical_colibri-imx6ull = ""
+RRECOMMENDS_packagegroup-gpu-tdx-graphical_colibri-imx6ull-emmc = ""
RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8 = " \
tinycompress \
libvdk-imx \
diff --git a/recipes-images/images/packagegroup-tdx-qt5.bb b/recipes-images/images/packagegroup-tdx-qt5.bb
index ea14bc9..f3828ba 100644
--- a/recipes-images/images/packagegroup-tdx-qt5.bb
+++ b/recipes-images/images/packagegroup-tdx-qt5.bb
@@ -22,6 +22,10 @@ RRECOMMENDS_${PN}_colibri-imx6ull = " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
qtbase-examples \
"
+RRECOMMENDS_${PN}_colibri-imx6ull-emmc = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+ qtbase-examples \
+"
RRECOMMENDS_${PN}_colibri-imx7 = " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
qtbase-examples \
diff --git a/recipes-images/images/tdx-reference-minimal-image.bb b/recipes-images/images/tdx-reference-minimal-image.bb
index ae2e0dc..0aaa42f 100644
--- a/recipes-images/images/tdx-reference-minimal-image.bb
+++ b/recipes-images/images/tdx-reference-minimal-image.bb
@@ -18,6 +18,9 @@ COPY_LIC_DIRS ?= "1"
TEZI_SHOW_EULA_LICENSE ?= "1"
TEZI_SHOW_EULA_LICENSE_apalis-tk1 ?= "0"
TEZI_SHOW_EULA_LICENSE_use-mainline-bsp ?= "0"
+TEZI_SHOW_EULA_LICENSE_colibri-imx6_use-mainline-bsp ?= "1"
+TEZI_SHOW_EULA_LICENSE_apalis-imx6_use-mainline-bsp ?= "1"
+
add_rootfs_version () {
printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) \\\n \\\l\n" > ${IMAGE_ROOTFS}/etc/issue
diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb
index 8365909..cd9c396 100644
--- a/recipes-images/images/tdx-reference-multimedia-image.bb
+++ b/recipes-images/images/tdx-reference-multimedia-image.bb
@@ -11,7 +11,11 @@ export IMAGE_BASENAME = "Reference-Multimedia-Image"
# Show Tezi EULA license
TEZI_SHOW_EULA_LICENSE ?= "1"
TEZI_SHOW_EULA_LICENSE_apalis-tk1 ?= "0"
+
TEZI_SHOW_EULA_LICENSE_use-mainline-bsp ?= "0"
+TEZI_SHOW_EULA_LICENSE_colibri-imx6_use-mainline-bsp ?= "1"
+TEZI_SHOW_EULA_LICENSE_apalis-imx6_use-mainline-bsp ?= "1"
+
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -23,12 +27,14 @@ IMAGE_FEATURES += " \
APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience"
APP_LAUNCH_WAYLAND_colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock"
+APP_LAUNCH_WAYLAND_colibri-imx6ull-emmc ?= "wayland-qtdemo-launch-analogclock"
APP_LAUNCH_WAYLAND_colibri-imx7 ?= "wayland-qtdemo-launch-analogclock"
APP_LAUNCH_WAYLAND_colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock"
APP_LAUNCH_WAYLAND_apalis-tk1 ?= "wayland-qtdemo-launch-qtsmarthome"
APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience"
APP_LAUNCH_X11_colibri-imx6ull ?= "x-window-analogclock"
+APP_LAUNCH_X11_colibri-imx6ull-emmc ?= "x-window-analogclock"
APP_LAUNCH_X11_colibri-imx7 ?= "x-window-analogclock"
APP_LAUNCH_X11_colibri-imx7-emmc ?= "x-window-analogclock"
APP_LAUNCH_X11_apalis-tk1 ?= "x-window-qtsmarthome"