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-devtools/qemu/qemu.inc | |
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-devtools/qemu/qemu.inc')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 7eef705206..26b0c93b58 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -2,7 +2,7 @@ SUMMARY = "Fast open source processor emulator" | |||
2 | HOMEPAGE = "http://qemu.org" | 2 | HOMEPAGE = "http://qemu.org" |
3 | LICENSE = "GPLv2 & LGPLv2.1" | 3 | LICENSE = "GPLv2 & LGPLv2.1" |
4 | DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \ | 4 | DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \ |
5 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" | 5 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" |
6 | DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" | 6 | DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" |
7 | DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc" | 7 | DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc" |
8 | RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl" | 8 | RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl" |
@@ -38,7 +38,7 @@ do_configure_prepend_class-native() { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | do_configure_prepend_class-nativesdk() { | 40 | do_configure_prepend_class-nativesdk() { |
41 | if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then | 41 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then |
42 | # Undo the -lX11 added by linker-flags.patch | 42 | # Undo the -lX11 added by linker-flags.patch |
43 | sed -i 's/-lX11//g' Makefile.target | 43 | sed -i 's/-lX11//g' Makefile.target |
44 | fi | 44 | fi |