diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-02-14 13:24:18 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-21 19:41:57 +0000 |
| commit | 71ef3de21918be4882833789ae970ab4b408b300 (patch) | |
| tree | fa178199aeb04fd0d6291827db5c505075e9ab58 | |
| parent | 1f4217d07ebf89fabfc67326f50cf32b2cfc5130 (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.
Change-Id: If00094eeb8bf96f1023b6760a3378a451e1816a7
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 6ae893d5a657f53d14411c5aac38546f569f03c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 5 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults | 1 |
2 files changed, 6 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 ''} \ " diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults index 751210b0..e4c6b114 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults @@ -3,3 +3,4 @@ QTWEBENGINE_DISABLE_SANDBOX=1 XDG_RUNTIME_DIR=/run/user/0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/dbus_session_socket WAYLAND_DISPLAY=/run/wayland-0 +SQUISH_PREFIX=/opt/squish |