Merge pull request #2542 from lucianogdittgen/master

meta-freescale: Clean up overrides, features, and dynamic layers

25 files changed, 27 insertions, 14 deletions

diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index 5186c2a41..9c8f9ce7d 100644
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -12,7 +12,7 @@ python () {
         d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
         d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))
 
-    error_qa = d.getVar('ERROR_QA')
-    if 'arch' in error_qa:
-        d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
+        error_qa = (d.getVar('ERROR_QA') or '').split()
+        if 'arch' in error_qa:
+            d.setVar('ERROR_QA', ' '.join(flag for flag in error_qa if flag != 'arch'))
 }
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
index 724d0ff53..724d0ff53 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
index 534d37627..534d37627 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
index 2706dca97..2706dca97 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
diff --git a/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
index b1b00623d..b1b00623d 100644
--- a/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
diff --git a/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
index 59da6ab32..59da6ab32 100644
--- a/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
diff --git a/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
index 46232ec5c..46232ec5c 100644
--- a/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
diff --git a/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
index 948a80faf..948a80faf 100644
--- a/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
diff --git a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
index d56b8ae67..d56b8ae67 100644
--- a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
diff --git a/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
index aa7d335ea..aa7d335ea 100644
--- a/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
diff --git a/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch
index c5a64387f..c5a64387f 100644
--- a/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch
diff --git a/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
index 5d88d1a6a..5d88d1a6a 100644
--- a/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
diff --git a/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
index 7b2c4100a..7b2c4100a 100644
--- a/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
diff --git a/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
index d39c05822..d39c05822 100644
--- a/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
diff --git a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
index ef7831a5f..ef7831a5f 100644
--- a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
diff --git a/recipes-support/opencv/opencv/download.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/download.patch
index 33ac48312..33ac48312 100644
--- a/recipes-support/opencv/opencv/download.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/download.patch
diff --git a/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
index 3538f24b3..3538f24b3 100644
--- a/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
index 0195bc61a..0195bc61a 100644
--- a/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index 98fb5c5e5..f43f2adee 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRC
 SRCBRANCH = "lf-6.18.2_1.0.0"
 SRCREV = "d7e4bb37b45bbf93faf888e0ca6763a29e28054a"
 
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
 
 inherit allarch
 
diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend
index 0f9b5a87d..660984d7a 100644
--- a/recipes-connectivity/iproute2/iproute2_%.bbappend
+++ b/recipes-connectivity/iproute2/iproute2_%.bbappend
@@ -1,5 +1,11 @@
-do_install:append () {
-    install -d ${D}/usr/include/tc 
+do_install:append:imx-generic-bsp () {
+    install -d ${D}/usr/include/tc
+    cp -a ${B}/include  ${D}/usr/include
+    cp -a ${B}/tc/*.h    ${D}/usr/include/tc
+}
+
+do_install:append:qoriq-generic-bsp () {
+    install -d ${D}/usr/include/tc
     cp -a ${B}/include  ${D}/usr/include
     cp -a ${B}/tc/*.h    ${D}/usr/include/tc
 }
diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
index c78828e6f..43af6f7e9 100644
--- a/recipes-fsl/images/fsl-image-machine-test.bb
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -20,8 +20,10 @@ CORE_IMAGE_EXTRA_INSTALL += " \
     packagegroup-fsl-gstreamer1.0-full \
     packagegroup-fsl-tools-gpu \
     packagegroup-fsl-tools-gpu-external \
-    packagegroup-fsl-tools-testapps \
-    packagegroup-fsl-tools-benchmark \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', \
+                         'packagegroup-fsl-tools-testapps', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', \
+                         'packagegroup-fsl-tools-benchmark', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', \
                          'firmwared', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
diff --git a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
index 86ec697d2..c37cf7411 100644
--- a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
+++ b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
@@ -8,6 +8,8 @@ SRC_URI = "git://github.com/Unarmed1000/RapidVulkan;protocol=https;branch=master
 SRCREV = "e39a407c5ae880792d8843ada65a19dd26b3dca7"
 
 
-inherit cmake
+REQUIRED_DISTRO_FEATURES = "vulkan"
+
+inherit cmake features_check
 
 ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
index 4abe7db50..0118975a5 100644
--- a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
@@ -12,7 +12,9 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/vulkan-wsi-layer.git;protocol=https
            file://0001-wayland-Add-C-guard-before-__STDC_VERSION__-define.patch"
 SRCREV = "cb1a50cf7e640ad7306e673131ded98c0f133628"
 
-inherit cmake pkgconfig
+REQUIRED_DISTRO_FEATURES = "vulkan"
+
+inherit cmake pkgconfig features_check
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'headless', d)}"
 
diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend
index e88f558d4..fd375271f 100644
--- a/recipes-graphics/waffle/waffle_%.bbappend
+++ b/recipes-graphics/waffle/waffle_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:imxgpu := "${THISDIR}/${PN}:"
 
-SRC_URI += " \
+SRC_URI:append:imxgpu = " \
     file://0001-meson-Add-missing-wayland-dependency-on-EGL.patch \
     file://0002-meson-Separate-surfaceless-option-from-x11.patch \
 "
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 6e4db9110..7f5a7ffbe 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/imx-nxp-bsp:"
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp:"
 
-SRC_URI += "${SRC_URI_IMX}"
+SRC_URI:append:imx-nxp-bsp = " ${SRC_URI_IMX}"
 SRC_URI_IMX             = ""
 SRC_URI_IMX:mx6-nxp-bsp = " \
     file://0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch \
@@ -16,7 +16,7 @@ SRC_URI_IMX:mx9-nxp-bsp = " \
 
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
 
-do_install:append() {
+do_install:append:imx-nxp-bsp() {
     if [ -e "${UNPACKDIR}/daemon.conf" ] && [ -e "${UNPACKDIR}/default.pa" ]; then
         install -m 0644 ${UNPACKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
         install -m 0644 ${UNPACKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa