diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-graphics/wayland | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r-- | meta/recipes-graphics/wayland/weston_1.4.0.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb index 521316659c..afdc49c9b9 100644 --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb | |||
@@ -28,9 +28,9 @@ EXTRA_OECONF = "--enable-setuid-install \ | |||
28 | --disable-rdp-compositor" | 28 | --disable-rdp-compositor" |
29 | 29 | ||
30 | 30 | ||
31 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ | 31 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ |
32 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
33 | ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ | 33 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ |
34 | " | 34 | " |
35 | # | 35 | # |
36 | # Compositor choices | 36 | # Compositor choices |
@@ -59,7 +59,7 @@ do_install_append() { | |||
59 | rm -f ${D}/${libdir}/weston/*.la | 59 | rm -f ${D}/${libdir}/weston/*.la |
60 | 60 | ||
61 | # If X11, ship a desktop file to launch it | 61 | # If X11, ship a desktop file to launch it |
62 | if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then | 62 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then |
63 | install -d ${D}${datadir}/applications | 63 | install -d ${D}${datadir}/applications |
64 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | 64 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications |
65 | 65 | ||