diff options
| author |   Joe Slater <joe.slater@windriver.com> | 2022-03-23 11:18:53 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-24 17:41:41 +0000 |
| commit | 1c7802f025eb3d9ee3310e083a5d8bef7178de9c (patch) | |
| tree | f62303212dd9b813c7b09ef6445f9a058e1b6496 /meta/recipes-graphics | |
| parent | bf4a7eee09245c0f7f8939f4cd522646fec6e507 (diff) | |
| download | openembedded-core-1c7802f025eb3d9ee3310e083a5d8bef7178de9c.tar.gz | |
weston: use same distro features for weston and westion-init
We want to avoid situations (like world builds) where
weston-init will build, but weston won't. This could
cause "nothing RPROVIDES..." dependency errors. We set
required distro features in a common include file.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/wayland/required-distro-features.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston-init.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_10.0.0.bb | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/meta/recipes-graphics/wayland/required-distro-features.inc b/meta/recipes-graphics/wayland/required-distro-features.inc new file mode 100644 index 0000000000..bb4a0e8ebd --- /dev/null +++ b/meta/recipes-graphics/wayland/required-distro-features.inc @@ -0,0 +1,8 @@ +# distro features required by weston recipes + +inherit features_check + +# requires pam enabled if started via systemd +# +REQUIRED_DISTRO_FEATURES = "wayland opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" + diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 89fa1ac738..497d860203 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -63,13 +63,13 @@ do_install() { INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}" -inherit update-rc.d features_check systemd useradd +inherit update-rc.d systemd useradd USERADD_PACKAGES = "${PN}" # rdepends on weston which depends on virtual/egl -# requires pam enabled if started via systemd -REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" +# +require ${THISDIR}/required-distro-features.inc RDEPENDS:${PN} = "weston kbd" diff --git a/meta/recipes-graphics/wayland/weston_10.0.0.bb b/meta/recipes-graphics/wayland/weston_10.0.0.bb index bebe95f69d..8424b4d548 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.0.bb @@ -19,10 +19,11 @@ SRC_URI[sha256sum] = "5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit meson pkgconfig useradd features_check +inherit meson pkgconfig useradd + # depends on virtual/egl -# weston-init requires pam enabled if started via systemd -REQUIRED_DISTRO_FEATURES = "wayland opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" +# +require ${THISDIR}/required-distro-features.inc DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" |