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/cogl | |
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/cogl')
-rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 15bfea26bc..a4a85506ff 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc | |||
@@ -53,8 +53,8 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" | |||
53 | # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by | 53 | # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by |
54 | # default. | 54 | # default. |
55 | PACKAGECONFIG ??= "cogl-pango gles2 \ | 55 | PACKAGECONFIG ??= "cogl-pango gles2 \ |
56 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ | 56 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ |
57 | ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" | 57 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" |
58 | 58 | ||
59 | FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" | 59 | FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" |
60 | FILES_libcogl = "${libdir}/libcogl${SOLIBS}" | 60 | FILES_libcogl = "${libdir}/libcogl${SOLIBS}" |