summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/conf
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-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/conf')
-rw-r--r--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/include/x86-base.inc6
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
5 files changed, 7 insertions, 7 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 419ffcdaf2..a1167fdfbf 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -39,7 +39,7 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
39PREFERRED_PROVIDER_console-tools ?= "kbd" 39PREFERRED_PROVIDER_console-tools ?= "kbd"
40PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 40PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
41PREFERRED_PROVIDER_make ?= "make" 41PREFERRED_PROVIDER_make ?= "make"
42PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" 42PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
43# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details 43# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
44# on this rather strange entry. 44# on this rather strange entry.
45PREFERRED_PROVIDER_bluez4 ?= "bluez4" 45PREFERRED_PROVIDER_bluez4 ?= "bluez4"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 591f6b4a62..a5fc88aa01 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
6 6
7XSERVER ?= "xserver-xorg \ 7XSERVER ?= "xserver-xorg \
8 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 8 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
9 xf86-input-evdev \ 9 xf86-input-evdev \
10 xf86-input-mouse \ 10 xf86-input-mouse \
11 xf86-video-fbdev \ 11 xf86-video-fbdev \
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index d6c4d6010f..f7c8a45fa7 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -33,16 +33,16 @@ XSERVER_X86_BASE = "xserver-xorg \
33 " 33 "
34 34
35XSERVER_X86_EXT = " \ 35XSERVER_X86_EXT = " \
36 ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
37 xserver-xorg-module-libint10 \ 37 xserver-xorg-module-libint10 \
38 " 38 "
39 39
40XSERVER_X86_I915 = "xf86-video-intel \ 40XSERVER_X86_I915 = "xf86-video-intel \
41 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ 41 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \
42 " 42 "
43 43
44XSERVER_X86_I965 = "xf86-video-intel \ 44XSERVER_X86_I965 = "xf86-video-intel \
45 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
46 " 46 "
47 47
48XSERVER_X86_VESA = "xf86-video-vesa" 48XSERVER_X86_VESA = "xf86-video-vesa"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 6533e56b59..642a2d9b52 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "bzImage"
16SERIAL_CONSOLE = "115200 ttyS0" 16SERIAL_CONSOLE = "115200 ttyS0"
17 17
18XSERVER = "xserver-xorg \ 18XSERVER = "xserver-xorg \
19 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
20 xf86-input-vmmouse \ 20 xf86-input-vmmouse \
21 xf86-input-keyboard \ 21 xf86-input-keyboard \
22 xf86-input-evdev \ 22 xf86-input-evdev \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 94ee57392d..ebc27dba47 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
15SERIAL_CONSOLE = "115200 ttyS0" 15SERIAL_CONSOLE = "115200 ttyS0"
16 16
17XSERVER = "xserver-xorg \ 17XSERVER = "xserver-xorg \
18 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 18 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
19 xf86-input-vmmouse \ 19 xf86-input-vmmouse \
20 xf86-input-keyboard \ 20 xf86-input-keyboard \
21 xf86-input-evdev \ 21 xf86-input-evdev \