diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2016-05-18 13:40:41 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-21 22:21:29 +0100 |
commit | 6295197adc022445fff01ca5ee75780a4c007d99 (patch) | |
tree | b611cee68af163fbc5e1ce3915a5e8397e5a22a8 /meta/recipes-graphics/wayland/weston_1.10.0.bb | |
parent | f16f3d67fd71357de75e64e77414767629565e98 (diff) | |
download | openembedded-core-contrib-6295197adc022445fff01ca5ee75780a4c007d99.tar.gz |
weston: Provide a default version of weston-launch that doesn't require PAM
weston-launch requires PAM for starting weston as a non-root user.
Since starting weston as root is a valid use case by itself, we check
the distro for 'pam' and build weston-launch with or without
non-root-user support.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston_1.10.0.bb')
-rw-r--r-- | meta/recipes-graphics/wayland/weston_1.10.0.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb index 29da5541b4..c9168d7ab8 100644 --- a/meta/recipes-graphics/wayland/weston_1.10.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb @@ -12,6 +12,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-make-error-portable.patch \ file://0001-configure.ac-Fix-wayland-protocols-path.patch \ file://make-weston-launch-exit-for-unrecognized-option.patch \ + file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20" SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1" @@ -39,9 +40,9 @@ EXTRA_OECONF_append_qemux86-64 = "\ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - clients" + clients launch" # # Compositor choices # @@ -56,7 +57,7 @@ PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compo # Weston on framebuffer PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" # weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" +PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,drm" # VA-API desktop recorder PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" # Weston with EGL support @@ -77,6 +78,8 @@ PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland" PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" # Clients support PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients" +# Weston with PAM support +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them |