diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-06-03 06:31:48 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-06-03 07:27:57 +0000 |
| commit | f656fa62d387eebcfc9e070ee7b4fe161ccc7a69 (patch) | |
| tree | 8b45911c8067509fe9e2582bd7a496dd443dd538 | |
| parent | e3a4bd0bf23ce75d1e8159bff4e936edf0522228 (diff) | |
sdk: exclude all Qt complemetary packages
PACKAGE_EXCLUDE_COMPLEMENTARY takes regular expression to exclude
complementary -dev and -dbg packages. Update list to exclude all
Qt current modules.
Any Qt package that get debian autorenamed is likely to be renamed
to libqt6*, which needs to be excluded separately since the regexs
works only against the final package name.
Change-Id: I10b39eb04e2951e7a22a7462e17fa42fc0cc0497
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb | 54 |
1 files changed, 12 insertions, 42 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 b494913c..808df734 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 @@ -36,52 +36,22 @@ inherit populate_sdk SDKIMAGE_FEATURES = "dev-pkgs" +MACHINE_EXTRA_INSTALL_SDK ?= "" + TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host" TOOLCHAIN_TARGET_TASK += "packagegroup-qt6-modules ${MACHINE_EXTRA_INSTALL_SDK}" PACKAGE_EXCLUDE_COMPLEMENTARY += "\ - ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'qmlcompilerplus-dev', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ - qt5compat-dev \ - qtapplicationmanager-dev \ - qtbase-dev \ - qtbase-staticdev \ - qtcharts-dev \ - qtcoap-dev \ - qtconnectivity-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d-dev', '', d)} \ - qtdeclarative-dev \ - qtdeclarative-staticdev \ - qtdeviceutilities-dev \ - qtimageformats-dev \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'qtinterfaceframework-dev', '', d)} \ - qtlottie-dev \ - qtmqtt-dev \ - qtmultimedia-dev \ - qtnetworkauth-dev \ - qtopcua-dev \ - qtpositioning-dev \ - qtquick3d-dev \ - qtquickdesigner-components-dev \ - qtquicktimeline-dev \ - qtremoteobjects-dev \ - qtscxml-dev \ - qtsensors-dev \ - qtserialbus-dev \ - qtserialport-dev \ - qtshadertools-dev \ - qtspeech-dev \ - qtsvg-dev \ - qttools-dev \ - qttranslations-dev \ - qtvirtualkeyboard-dev \ - ${@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)} \ - " + ^libqt6 \ + qmlcompilerplus qt3d qt5compat qtapplicationmanager qtbase qtcharts \ + qtcoap qtconnectivity qtdatavis3d qtdeclarative qtdeviceutilities \ + qthttpserver qtimageformats qtinterfaceframework qtlanguageserver qtlottie \ + qtmqtt qtmultimedia qtnetworkauth qtopcua qtpdf qtpositioning \ + qtquick3dphysics qtquick3d qtquickdesigner-components qtquicktimeline \ + qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtshadertools \ + qtspeech qtsvg qttools qttranslations qtvirtualkeyboard qtvncserver \ + qtwayland qtwebchannel qtwebengine qtwebsockets qtwebview \ +" SDK_POSTPROCESS_COMMAND:prepend = "apply_ci_fixes;" |