diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-14 13:24:18 +0000 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-21 18:51:22 +0000 |
commit | 6ae893d5a657f53d14411c5aac38546f569f03c4 (patch) | |
tree | a548fa7db199e86acc6477352b04c25b514d6a71 /meta-boot2qt-distro | |
parent | a5c7493ec82eaadf6326bddd40a5272948d5c070 (diff) |
Include Squish plugins in the image
Add embedded parts of Squish needed on the device. The squish packages
are internal only, so recipe is not used unless build is done in
Qt internal network. Enable only for Qt 6.7 and 6.6.
Pick-to: nanbield mickledore kirkstone
Change-Id: If00094eeb8bf96f1023b6760a3378a451e1816a7
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index a2e27f21..c854a542 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -37,6 +37,10 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" USE_QT_DEMO_LAUNCHER ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.7', '>'), False, d)}" +USE_SQUISH ?= "${@bb.utils.contains('QT_INTERNAL_BUILD', '1', \ + bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.6', '>') & \ + bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.8', '<'), False, d)}" + RDEPENDS:${PN} += " \ ${@'boot2qt-demolauncher' if bb.utils.to_boolean(d.getVar('USE_QT_DEMO_LAUNCHER')) else ''} \ boot2qt-appcontroller \ @@ -44,4 +48,5 @@ RDEPENDS:${PN} += " \ qdb \ qtdeclarative-tools \ qttools-tools \ + ${@'squish' if bb.utils.to_boolean(d.getVar('USE_SQUISH')) else ''} \ " |