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

diff --git a/meta-agl-core/conf/layer.conf b/meta-agl-core/conf/layer.conf
index d2e973d..2749aec 100644 (file)
--- 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 (file)
index 0000000..0db6066
--- /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 (file)
index 0000000..6167f45
--- /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 12342aa..8593030 100644 (file)
--- 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 \
                   "