diff options
Diffstat (limited to 'meta-agl-core/recipes-platform')
3 files changed, 3 insertions, 11 deletions
diff --git a/meta-agl-core/recipes-platform/images/agl-image-compositor.bb b/meta-agl-core/recipes-platform/images/agl-image-compositor.bb index ea48f474f..b78536be8 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-compositor.bb +++ b/meta-agl-core/recipes-platform/images/agl-image-compositor.bb @@ -11,5 +11,5 @@ SYSTEMD_DEFAULT_TARGET = "graphical.target" IMAGE_INSTALL += " \ packagegroup-agl-graphical-compositor \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'agl-shell-activator weston-examples', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'weston-examples', '', d)} \ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-compositor.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-compositor.bb index be124925f..b2c7d8ec8 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-compositor.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-compositor.bb @@ -1,13 +1,9 @@ DESCRIPTION = "The minimal set of packages required for the AGL compositor" LICENSE = "MIT" -inherit packagegroup features_check - -# agl-compositor-init requires pam enabled if started via systemd -REQUIRED_DISTRO_FEATURES = "wayland ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" +inherit packagegroup RDEPENDS:${PN} += " \ agl-compositor \ agl-compositor-init \ - ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ " 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 af4d90c49..96f09d5ab 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 @@ -1,13 +1,9 @@ DESCRIPTION = "The minimal set of packages required for the Weston compositor" LICENSE = "MIT" -inherit packagegroup features_check - -# weston-init requires pam enabled if started via systemd -REQUIRED_DISTRO_FEATURES = "wayland ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" +inherit packagegroup RDEPENDS:${PN} += " \ weston \ weston-init \ - ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ " |