diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-05-17 11:20:24 +0300 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-05-20 12:40:14 +0300 |
| commit | 4cb3d625c91c616d0d94ae95d56e8c4881dbe727 (patch) | |
| tree | 03d79f80f935ee9ae763e2184edfb4ff9b9590fd | |
| parent | f1992059e06f7b53bf41b94512ff9f967f3b38fc (diff) | |
CI SDK: correctly exclude Qt modules
Change-Id: I39e74e720bfdb07e54d8abbd48d0b2c4999ad8fc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb index d5802eac..f7d8ba8b 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb @@ -39,9 +39,11 @@ SDKIMAGE_FEATURES = "dev-pkgs" TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host" TOOLCHAIN_TARGET_TASK += "packagegroup-qt6-modules ${MACHINE_EXTRA_INSTALL_SDK}" -PACKAGE_EXCLUDE += "\ +PACKAGE_EXCLUDE_COMPLEMENTARY += "\ + ${@bb.utils.contains('ENABLE_QMLCOMPILER', '1', 'qmlcompilerplus-dev', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ qt5compat-dev \ + qtapplicationmanager-dev \ qtbase-dev \ qtbase-staticdev \ qtcharts-dev \ @@ -51,8 +53,8 @@ PACKAGE_EXCLUDE += "\ qtdeclarative-dev \ qtdeclarative-staticdev \ qtdeviceutilities-dev \ - qtgraphicaleffects-dev \ qtimageformats-dev \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'qtinterfaceframework-dev', '', d)} \ qtlottie-dev \ qtmqtt-dev \ qtmultimedia-dev \ @@ -76,6 +78,9 @@ PACKAGE_EXCLUDE += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ qtwebchannel-dev \ qtwebsockets-dev \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf-dev', '', d)} \ " SDK_POSTPROCESS_COMMAND:prepend = "apply_ci_fixes;" |