From f389ceaa95bedd605012d64b3697f0963d47ac27 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 23 May 2022 12:35:00 +0000 Subject: [PATCH] packagegroup: limit modules based on architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not all modules are compatible with all architectures. Change-Id: If44be478ff6cde47e4ad70ee31eb5059058307e5 Reviewed-by: Pasi Petäjäjärvi --- recipes-qt/packagegroups/packagegroup-qt6-addons.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb index 189b9ac..9aeca52 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb @@ -25,7 +25,6 @@ RDEPENDS:${PN} += " \ qtmultimedia \ qtnetworkauth \ qtopcua \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \ qtpositioning \ qtquick3d \ qtquickdesigner-components \ @@ -44,7 +43,15 @@ RDEPENDS:${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtwebchannel \ qtwebsockets \ +" + +ARCHITECTURE_LIMITED_MODULES = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-tools', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview', '', d)} \ " +RDEPENDS:${PN}:append:aarch64 ="${ARCHITECTURE_LIMITED_MODULES}" +RDEPENDS:${PN}:append:arm ="${ARCHITECTURE_LIMITED_MODULES}" +RDEPENDS:${PN}:append:x86 ="${ARCHITECTURE_LIMITED_MODULES}" +RDEPENDS:${PN}:append:x86-64 ="${ARCHITECTURE_LIMITED_MODULES}"