From 0a897b04f2c43a7e839f23f0d24bb10bff2db417 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 7 Oct 2022 14:13:38 +0200 Subject: packagegroup-tdx-cli/graphical/qt5: fix overrides Turns out that somehow we still have some old override syntax stuff laying around! This prevented the btuart stuff being installed on the Verdin iMX8M Plus which would be responsible for out-of-the-box Bluetooth operation. Signed-off-by: Marcel Ziswiler (cherry picked from commit cdf85aa03e9f0d9c8a9bc880fa58fe2f978019ef) --- recipes-images/images/packagegroup-tdx-cli.bb | 4 ++-- recipes-images/images/packagegroup-tdx-graphical.bb | 4 ++-- recipes-images/images/packagegroup-tdx-qt5.bb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index f360b48..2b4b056 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -98,13 +98,13 @@ RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6ull = "\ mtd-utils-ubifs \ mwifiexap \ " -RRECOMMENDS_packagegroup-machine-tdx-cli:colibri-imx6ull-emmc = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6ull-emmc = "\ bmode-usb \ " RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx7 = "\ mtd-utils-ubifs \ " -RRECOMMENDS_packagegroup-machine-tdx-cli:verdin-imx8mp = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:verdin-imx8mp = "\ btuart \ mwifiexap \ " diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index 2dc48e4..69afb44 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -52,7 +52,7 @@ GSTREAMER_MX6QDL = " \ RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl-nxp-bsp = " ${GSTREAMER_MX6QDL}" RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q-nxp-bsp = " ${GSTREAMER_MX6QDL}" RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = "" RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7-nxp-bsp = " imx-gst1.0-plugin" RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8-nxp-bsp = " \ imx-gst1.0-plugin \ @@ -80,7 +80,7 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q-nxp-bsp = " \ ${IMAGE_INSTALL_OPENCL_IMX} \ " RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8-nxp-bsp = " \ tinycompress \ libvdk-imx \ diff --git a/recipes-images/images/packagegroup-tdx-qt5.bb b/recipes-images/images/packagegroup-tdx-qt5.bb index 293caad..3d4f94d 100644 --- a/recipes-images/images/packagegroup-tdx-qt5.bb +++ b/recipes-images/images/packagegroup-tdx-qt5.bb @@ -22,7 +22,7 @@ RRECOMMENDS:${PN}:colibri-imx6ull = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " -RRECOMMENDS_${PN}:colibri-imx6ull-emmc = " \ +RRECOMMENDS:${PN}:colibri-imx6ull-emmc = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " -- cgit v1.2.3