From eab334ade5d38b3539f456c8cb55d1975e358791 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 3 Mar 2021 14:06:39 +0100 Subject: core-image.bbclass: add a weston IMAGE_FEATURE, similar to x11-base (From OE-Core rev: 5dd4bf88f59d3dddb5368163baba02f053eec502) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/core-image.bbclass | 2 ++ meta/recipes-graphics/images/core-image-weston.bb | 8 +++----- .../packagegroups/packagegroup-core-weston.bb | 13 +++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 88ca272145..d81f68bd2e 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -9,6 +9,7 @@ # # Available IMAGE_FEATURES: # +# - weston - Weston Wayland compositor # - x11 - X server # - x11-base - X server with minimal environment # - x11-sato - OpenedHand Sato environment @@ -37,6 +38,7 @@ # - stateless-rootfs - systemctl-native not run, image populated by systemd at runtime # - splash - bootup splash screen # +FEATURE_PACKAGES_weston = "packagegroup-core-weston" FEATURE_PACKAGES_x11 = "packagegroup-core-x11" FEATURE_PACKAGES_x11-base = "packagegroup-core-x11-base" FEATURE_PACKAGES_x11-sato = "packagegroup-core-x11-sato" diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb index 8d88e3bc0c..e82e4fbb3f 100644 --- a/meta/recipes-graphics/images/core-image-weston.bb +++ b/meta/recipes-graphics/images/core-image-weston.bb @@ -1,14 +1,12 @@ SUMMARY = "A very basic Wayland image with a terminal" -IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs" +IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs weston" LICENSE = "MIT" -inherit core-image features_check +inherit core-image -REQUIRED_DISTRO_FEATURES = "wayland" - -CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples wayland-utils gtk+3-demo clutter-1.0-examples" +CORE_IMAGE_BASE_INSTALL += "gtk+3-demo clutter-1.0-examples" CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" QB_MEM = "-m 512" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb new file mode 100644 index 0000000000..340c8e75ed --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb @@ -0,0 +1,13 @@ +SUMMARY = "Basic Weston compositor setup" +DESCRIPTION = "Packages required to set up a basic working Weston session" +PR = "r1" + +inherit packagegroup features_check +REQUIRED_DISTRO_FEATURES = "wayland" + +RDEPENDS_${PN} = "\ + weston \ + weston-init \ + weston-examples \ + wayland-utils \ + " -- cgit v1.2.3-54-g00ecf