diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/weston_1.11.1.bb')
-rw-r--r-- | meta/recipes-graphics/wayland/weston_1.11.1.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.11.1.bb b/meta/recipes-graphics/wayland/weston_1.11.1.bb index cdfac70ed1..22b30ad2d3 100644 --- a/meta/recipes-graphics/wayland/weston_1.11.1.bb +++ b/meta/recipes-graphics/wayland/weston_1.11.1.bb @@ -37,10 +37,8 @@ EXTRA_OECONF_append_qemux86-64 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ " 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', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ clients launch" # # Compositor choices @@ -85,7 +83,7 @@ do_install_append() { rm -f ${D}/${libdir}/weston/*.la # If X11, ship a desktop file to launch it - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then install -d ${D}${datadir}/applications install ${WORKDIR}/weston.desktop ${D}${datadir}/applications |