From 05cc0d582c0d3a8a20b02b992589b151b2aad10a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 4 Aug 2021 15:19:44 +0200 Subject: colibri-imx6ull-emmc: add machine specific overrides Signed-off-by: Max Krummenacher (cherry picked from commit f99619b2135ff939b6370be8116d66a10bc84836) --- recipes-images/images/packagegroup-tdx-cli.bb | 3 +++ recipes-images/images/packagegroup-tdx-graphical.bb | 2 ++ recipes-images/images/packagegroup-tdx-qt5.bb | 4 ++++ recipes-images/images/tdx-reference-multimedia-image.bb | 2 ++ 4 files changed, 11 insertions(+) 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-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index 144e607..cd9c396 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -27,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" -- cgit v1.2.3