diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | recipes-devtools/python/python3-appdirs_1.4.4.bbappend (renamed from dynamic-layers/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bbappend) | 0 | ||||
| -rw-r--r-- | recipes-devtools/python/python3-pytest-qt_4.0.2.bb (renamed from dynamic-layers/meta-python/recipes-devtools/python/python3-pytest-qt_4.0.2.bb) | 0 | ||||
| -rw-r--r-- | recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb | 6 | ||||
| -rw-r--r-- | recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-qt6-addons.bb | 4 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 5 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtinterfaceframework_git.bb | 5 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtserialbus_git.bb | 4 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtwebengine_git.bb | 17 |
10 files changed, 16 insertions, 29 deletions
@@ -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 diff --git a/dynamic-layers/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bbappend b/recipes-devtools/python/python3-appdirs_1.4.4.bbappend index 608377e..608377e 100644 --- a/dynamic-layers/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bbappend +++ b/recipes-devtools/python/python3-appdirs_1.4.4.bbappend diff --git a/dynamic-layers/meta-python/recipes-devtools/python/python3-pytest-qt_4.0.2.bb b/recipes-devtools/python/python3-pytest-qt_4.0.2.bb index ea06112..ea06112 100644 --- a/dynamic-layers/meta-python/recipes-devtools/python/python3-pytest-qt_4.0.2.bb +++ b/recipes-devtools/python/python3-pytest-qt_4.0.2.bb diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb index 0704796..97a3fdd 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb +++ b/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 \ " diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb index d41d0e3..e40a263 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb +++ b/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 \ " diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb index 51cf5ac..840118d 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb +++ b/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 \ diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index d111f39..9209301 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/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" diff --git a/recipes-qt/qt6/qtinterfaceframework_git.bb b/recipes-qt/qt6/qtinterfaceframework_git.bb index d4b7d8a..f13d5b2 100644 --- a/recipes-qt/qt6/qtinterfaceframework_git.bb +++ b/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" diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb index 5bfa80e..5d6dcd0 100644 --- a/recipes-qt/qt6/qtserialbus_git.bb +++ b/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 = "" diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index 74ed2ac..d436763 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/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" |