aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-11-21 22:38:11 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-11-23 14:04:04 +0000
commitf3046df0ebfcad301ec9da5dfda35b38b88b94d4 (patch)
treeaae9e911685dafb77939c40398e2b4a4699187b1
parentd8a00daaba8ccd7d2a14bc82bca032d3202db266 (diff)
agl-compositor: RDEPENDS fixes
Changes: - Add the required xkeyboard-config RDEPENDS to the agl-compositor recipe to avoid surprises if nothing else that pulls that in is in an image. - Move the agl-compositor RDEPENDS on polkit directly into the recipe instead of getting indirectly via a meta-oe presence driven addition to packagegroup-agl-graphical-weston. This is more correct, avoids surprises if that packagegroup happens to not be used, and will work better with a binary packagefeed. The RDEPENDS is still conditional on the presence of "polkit" in DISTRO_FEATURES, which seems a reasonable alternative to using dynamic-layers. Bug-AGL: SPEC-4619 Change-Id: I595f55a9d598b4a15fe345f50d1a7a203616dd15 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28184 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-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-graphics/wayland/agl-compositor_git.bb2
3 files changed, 2 insertions, 2 deletions
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
deleted file mode 100644
index 0db606679..000000000
--- a/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6167f459e..000000000
--- a/meta-agl-core/dynamic-layers/meta-oe/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_aglcore.inc
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS:${PN} += "polkit"
diff --git a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
index 68bc4e8b2..29b3c2782 100644
--- a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
+++ b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
@@ -34,6 +34,8 @@ FILES:${PN} = " \
RDEPENDS:${PN} += " \
agl-compositor-init \
+ xkeyboard-config \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)} \
"