diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-11-09 09:31:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-11 10:08:12 +0000 |
commit | 21c16589452da36fc234295d19d3e048141d1569 (patch) | |
tree | 1fc8dafbb2da64f579f5098338d37d7d0f063b53 | |
parent | fb8b3eeed9946e8991a9c745809e8d1415825ad2 (diff) | |
download | poky-21c16589452da36fc234295d19d3e048141d1569.tar.gz |
wayland-utils: introduce a recipe
wayland-utils contains wayland-info utility which deprecates
and replaces weston-info from weston.
(From OE-Core rev: bb8fa9950e716fdcee818a38dc4df3a19b1f3c2f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/cases/weston.py | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/images/core-image-weston.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb | 20 |
4 files changed, 26 insertions, 5 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 3df5a0434a..ad5f4672c7 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -721,6 +721,7 @@ RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>" | |||
721 | RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>" | 721 | RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>" |
722 | RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denys@ti.com>" | 722 | RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <denys@ti.com>" |
723 | RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys@ti.com>" | 723 | RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys@ti.com>" |
724 | RECIPE_MAINTAINER_pn-wayland-utils = "Denys Dmytriyenko <denys@ti.com>" | ||
724 | RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alex.kanavin@gmail.com>" | 725 | RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <alex.kanavin@gmail.com>" |
725 | RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@ti.com>" | 726 | RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys@ti.com>" |
726 | RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@ti.com>" | 727 | RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys@ti.com>" |
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py index d3fbf8ba92..a1c7183213 100644 --- a/meta/lib/oeqa/runtime/cases/weston.py +++ b/meta/lib/oeqa/runtime/cases/weston.py | |||
@@ -51,10 +51,10 @@ class WestonTest(OERuntimeTestCase): | |||
51 | 51 | ||
52 | return new_wl_processes, try_cnt | 52 | return new_wl_processes, try_cnt |
53 | 53 | ||
54 | @OEHasPackage(['weston']) | 54 | @OEHasPackage(['wayland-utils']) |
55 | def test_weston_info(self): | 55 | def test_wayland_info(self): |
56 | status, output = self.target.run(self.get_weston_command('weston-info')) | 56 | status, output = self.target.run(self.get_weston_command('wayland-info')) |
57 | self.assertEqual(status, 0, msg='weston-info error: %s' % output) | 57 | self.assertEqual(status, 0, msg='wayland-info error: %s' % output) |
58 | 58 | ||
59 | @OEHasPackage(['weston']) | 59 | @OEHasPackage(['weston']) |
60 | def test_weston_can_initialize_new_wayland_compositor(self): | 60 | def test_weston_can_initialize_new_wayland_compositor(self): |
diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb index fa7e9ef421..8d88e3bc0c 100644 --- a/meta/recipes-graphics/images/core-image-weston.bb +++ b/meta/recipes-graphics/images/core-image-weston.bb | |||
@@ -8,7 +8,7 @@ inherit core-image features_check | |||
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "wayland" | 9 | REQUIRED_DISTRO_FEATURES = "wayland" |
10 | 10 | ||
11 | CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" | 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)}" | 12 | CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" |
13 | 13 | ||
14 | QB_MEM = "-m 512" | 14 | QB_MEM = "-m 512" |
diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb new file mode 100644 index 0000000000..4c51f7e8c5 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland-utils_1.0.0.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Wayland utilities" | ||
2 | DESCRIPTION = "Wayland-utils contains (for now) \ | ||
3 | wayland-info, a utility for displaying information about the Wayland \ | ||
4 | protocols supported by a Wayland compositor. \ | ||
5 | wayland-info is basically a standalone version of weston-info as found \ | ||
6 | in weston repository. " | ||
7 | HOMEPAGE = "http://wayland.freedesktop.org" | ||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ | ||
10 | " | ||
11 | |||
12 | SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | ||
13 | " | ||
14 | SRC_URI[sha256sum] = "64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0" | ||
15 | |||
16 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | ||
17 | |||
18 | inherit meson pkgconfig | ||
19 | |||
20 | DEPENDS += "wayland wayland-native wayland-protocols" | ||