Remove checks for required meta layers

Since meta-openembedded and meta-python are now dependencies,
we can simplify some of the recipes that were checking if the
layers were available. Now always use the features available
from those layers.

Pick-to: 6.6 6.5
Change-Id: Ia70658e0c64b916c9d36ad9aca4c40172b86b5b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

README.md

@@ -5,8 +5,6 @@ This layer depends on:
 
 URI: https://git.openembedded.org/openembedded-core/
 
-and optionally:
-
 URI: https://git.openembedded.org/meta-openembedded/
 
 Yocto version support

recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb

@@ -11,8 +11,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS:${PN} += " \
     nativesdk-qtapplicationmanager-dev \
     nativesdk-qtapplicationmanager-tools \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'nativesdk-qtgrpc-dev', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'nativesdk-qtgrpc-tools', '', d)} \
+    nativesdk-qtgrpc-dev \
+    nativesdk-qtgrpc-tools \
     nativesdk-qtquick3d-dev \
     nativesdk-qtquick3d-tools \
     nativesdk-qtremoteobjects-dev \
@@ -28,6 +28,6 @@ RDEPENDS:${PN} += " \
 
 FORLINUXHOST:mingw32 = ""
 FORLINUXHOST = " \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
+    nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools \
 "
 

recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb

@@ -18,5 +18,5 @@ FORLINUXHOST = " \
     nativesdk-cmake \
     nativesdk-ninja \
     nativesdk-perl-modules \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'nativesdk-python3-html5lib', '', d)} \
+    nativesdk-python3-html5lib \
 "

recipes-qt/packagegroups/packagegroup-qt6-addons.bb

@@ -17,10 +17,10 @@ RDEPENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
     qtgraphs \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'qtgrpc', '', d)} \
+    qtgrpc \
     qthttpserver \
     qtimageformats \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'qtinterfaceframework', '', d)} \
+    qtinterfaceframework \
     qtlocation \
     qtlottie \
     qtmqtt \

recipes-qt/qt6/qtbase_git.bb

@@ -35,8 +35,7 @@ RDEPENDS_${PN}:remove:class-native = "libssl-native"
 RRECOMMENDS:${PN}:append:libc-glibc:class-target = " locale-base-c"
 
 PACKAGECONFIG:class-native ?= "\
-    gui widgets jpeg png dbus no-opengl openssl zlib \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
+    gui widgets jpeg png dbus no-opengl openssl zlib zstd \
 "
 PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
@@ -78,8 +77,8 @@ PACKAGECONFIG_DEFAULT ?= "\
     widgets \
     xkbcommon \
     zlib \
+    zstd \
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
 "
 
 PACKAGECONFIG:remove:mingw32 = "openssl"

recipes-qt/qt6/qtinterfaceframework_git.bb

@@ -13,11 +13,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-python() {
-    if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python to be present.')
-}
-
 # Default build and package these
 REFERENCE_API ?= "1"
 SIMULATION_SUPPORT ?= "1"

recipes-qt/qt6/qtserialbus_git.bb

@@ -16,9 +16,7 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ?= "modbus-serialport \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'socketcan', '', d)} \
-"
+PACKAGECONFIG ?= "modbus-serialport socketcan"
 PACKAGECONFIG:class-native = ""
 PACKAGECONFIG:class-nativesdk = ""
 

recipes-qt/qt6/qtwebengine_git.bb

@@ -26,25 +26,22 @@ SECURITY_STRINGFORMAT = ""
 
 PACKAGECONFIG ??= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
+    geolocation \
     glib \
+    lcms2 \
     libevent \
     libjpeg \
     libpci \
     libpng \
     libwebp \
-    zlib \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', '${PACKAGECONFIG_OPENEMBEDDED}', '', d)} \
-    geolocation \
-    webchannel \
-    printing-and-pdf \
-    pepper-plugins \
-    spellchecker \
-"
-PACKAGECONFIG_OPENEMBEDDED ?= "\
-    lcms2 \
     opus \
+    pepper-plugins \
+    printing-and-pdf \
     snappy \
+    spellchecker \
+    webchannel \
     webrtc \
+    zlib \
 "
 
 PACKAGECONFIG[alsa] = "-DFEATURE_webengine_system_alsa=ON,-DFEATURE_webengine_system_alsa=OFF,alsa-lib"