summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-05-27 09:22:18 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-05-27 15:56:01 +0000
commit37ca9c151895e972171e075b71d26a73e532fc20 (patch)
treea93848db3bc3d5da557cd589eb339bc5b85db2b4
parenta8c060f736a66dde56cc2ba1803d35531c62d610 (diff)
meta-agl-core: move polkit addition to dynamic-layers
Since polkit comes from meta-oe and not poky, move adding it to packagegroup-agl-graphical-weston to a bbappend that is in a meta-oe dynamic-layers hierarchy. This is required to avoid breaking the meta-agl-core testing on the Yocto autobuilder, which does not pull in meta-oe currently. This may need to be revisited down the road when providing a binary packagefeed is attempted, as it may be the case that explicitly adding meta-oe as a meta-agl-core dependency ends up the better solution for packagefeed stability. Bug-AGL: SPEC-4359, SPEC-4375 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I920d9184f936d0c529db944bf1667a470aa863c6 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27568 Reviewed-by: Marius Vlad <marius.vlad@collabora.com> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account
-rw-r--r--meta-agl-core/conf/layer.conf3
-rw-r--r--meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend1
-rw-r--r--meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglcore.inc1
-rw-r--r--meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb1
4 files changed, 5 insertions, 1 deletions
diff --git a/meta-agl-core/conf/layer.conf b/meta-agl-core/conf/layer.conf
index d2e973d98..2749aec47 100644
--- a/meta-agl-core/conf/layer.conf
+++ b/meta-agl-core/conf/layer.conf
@@ -10,6 +10,9 @@ BBFILE_PATTERN_aglcore = "^${LAYERDIR}/"
BBFILE_PRIORITY_aglcore = "60"
BBFILES_DYNAMIC += " \
+ openembedded-layer:${LAYERDIR}/dynamic-layers/meta-oe/*/*/*.bb \
+ openembedded-layer:${LAYERDIR}/dynamic-layers/meta-oe/*/*/*.bbappend \
+ \
qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bb \
qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bbappend \
"
diff --git a/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend b/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
new file mode 100644
index 000000000..0db606679
--- /dev/null
+++ b/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'packagegroup-agl-graphical-weston_aglcore.inc', '', d)}
diff --git a/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglcore.inc b/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglcore.inc
new file mode 100644
index 000000000..6167f459e
--- /dev/null
+++ b/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglcore.inc
@@ -0,0 +1 @@
+RDEPENDS:${PN} += "polkit"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
index 12342aa68..859303049 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
@@ -13,6 +13,5 @@ RDEPENDS:${PN} += " \
weston \
weston-init \
weston-examples \
- polkit \
"