diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-03-03 14:06:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-06 22:39:04 +0000 |
commit | eab334ade5d38b3539f456c8cb55d1975e358791 (patch) | |
tree | 2676dd98419e8d1281a67104594b2084a12a21ca | |
parent | a05bd5630d22cc817e64e86dccc8ad433da1b694 (diff) | |
download | poky-eab334ade5d38b3539f456c8cb55d1975e358791.tar.gz |
core-image.bbclass: add a weston IMAGE_FEATURE, similar to x11-base
(From OE-Core rev: 5dd4bf88f59d3dddb5368163baba02f053eec502)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/core-image.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/images/core-image-weston.bb | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb | 13 |
3 files changed, 18 insertions, 5 deletions
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 @@ | |||
9 | # | 9 | # |
10 | # Available IMAGE_FEATURES: | 10 | # Available IMAGE_FEATURES: |
11 | # | 11 | # |
12 | # - weston - Weston Wayland compositor | ||
12 | # - x11 - X server | 13 | # - x11 - X server |
13 | # - x11-base - X server with minimal environment | 14 | # - x11-base - X server with minimal environment |
14 | # - x11-sato - OpenedHand Sato environment | 15 | # - x11-sato - OpenedHand Sato environment |
@@ -37,6 +38,7 @@ | |||
37 | # - stateless-rootfs - systemctl-native not run, image populated by systemd at runtime | 38 | # - stateless-rootfs - systemctl-native not run, image populated by systemd at runtime |
38 | # - splash - bootup splash screen | 39 | # - splash - bootup splash screen |
39 | # | 40 | # |
41 | FEATURE_PACKAGES_weston = "packagegroup-core-weston" | ||
40 | FEATURE_PACKAGES_x11 = "packagegroup-core-x11" | 42 | FEATURE_PACKAGES_x11 = "packagegroup-core-x11" |
41 | FEATURE_PACKAGES_x11-base = "packagegroup-core-x11-base" | 43 | FEATURE_PACKAGES_x11-base = "packagegroup-core-x11-base" |
42 | FEATURE_PACKAGES_x11-sato = "packagegroup-core-x11-sato" | 44 | 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 @@ | |||
1 | SUMMARY = "A very basic Wayland image with a terminal" | 1 | SUMMARY = "A very basic Wayland image with a terminal" |
2 | 2 | ||
3 | IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs" | 3 | IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs weston" |
4 | 4 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | 6 | ||
7 | inherit core-image features_check | 7 | inherit core-image |
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "wayland" | 9 | CORE_IMAGE_BASE_INSTALL += "gtk+3-demo clutter-1.0-examples" |
10 | |||
11 | CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples wayland-utils gtk+3-demo clutter-1.0-examples" | ||
12 | CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" | 10 | CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" |
13 | 11 | ||
14 | QB_MEM = "-m 512" | 12 | 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 @@ | |||
1 | SUMMARY = "Basic Weston compositor setup" | ||
2 | DESCRIPTION = "Packages required to set up a basic working Weston session" | ||
3 | PR = "r1" | ||
4 | |||
5 | inherit packagegroup features_check | ||
6 | REQUIRED_DISTRO_FEATURES = "wayland" | ||
7 | |||
8 | RDEPENDS_${PN} = "\ | ||
9 | weston \ | ||
10 | weston-init \ | ||
11 | weston-examples \ | ||
12 | wayland-utils \ | ||
13 | " | ||