diff options
| author |   Denys Dmytriyenko <denys@konsulko.com> | 2023-02-28 01:34:49 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denys@konsulko.com> | 2023-02-28 01:34:49 +0000 |
| commit | ff95c0ed81339e6d517be3a98f972ac60532bef7 (patch) | |
| tree | 0410fc925701d064cc3a7722e16830a3d8f00646 | |
| parent | 321be58ab8a59195bf8557175cb7f4698e1144a6 (diff) | |
packagegroup-qt5-toolchain-target: make bbappend changes conditional
Make bbappend changing RDEPENDS variables conditional on "agldemo"
AGL_FEATURES flag. This resolved yocto-check-layer errors:
INFO: test_signatures (common.CommonCheckLayer)
INFO: ... FAIL
AssertionError: Adding layer meta-agl-demo changed signatures, basehash changed
Bug-AGL: SPEC-4685
Change-Id: If4953d684455b6f2ab5edbb3a33b5cf7775d1587
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
| -rw-r--r-- | recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend | 19 | ||||
| -rw-r--r-- | recipes-platform/packagegroups/packagegroup-qt5-toolchain-target_agldemo.inc | 18 |
2 files changed, 19 insertions, 18 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend index a677f40db..3583515f0 100644 --- a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend +++ b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend @@ -1,18 +1 @@ -# add missing dependencies for SDK - -RDEPENDS:${PN} += " \ - qttools-plugins \ - qtquickcontrols-dev \ - qtquickcontrols-qmlplugins \ - qtquickcontrols2-dev \ - qtquickcontrols2-mkspecs \ - qtquickcontrols2-qmlplugins \ -" - -# remove dependency on qtwebkit (still added to SDK by packagegroup-qt5-toolchain-target) -# see SPEC-1159 -RDEPENDS:${PN}:remove = " \ - qtwebkit-dev \ - qtwebkit-mkspecs \ - qtwebkit-qmlplugins \ -" +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'packagegroup-qt5-toolchain-target_agldemo.inc', '', d)} diff --git a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target_agldemo.inc b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target_agldemo.inc new file mode 100644 index 000000000..a677f40db --- /dev/null +++ b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target_agldemo.inc @@ -0,0 +1,18 @@ +# add missing dependencies for SDK + +RDEPENDS:${PN} += " \ + qttools-plugins \ + qtquickcontrols-dev \ + qtquickcontrols-qmlplugins \ + qtquickcontrols2-dev \ + qtquickcontrols2-mkspecs \ + qtquickcontrols2-qmlplugins \ +" + +# remove dependency on qtwebkit (still added to SDK by packagegroup-qt5-toolchain-target) +# see SPEC-1159 +RDEPENDS:${PN}:remove = " \ + qtwebkit-dev \ + qtwebkit-mkspecs \ + qtwebkit-qmlplugins \ +" |