mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Globally replace 'base_contains' calls with 'bb.utils.contains'

Browse Source 
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>
This commit is contained in:
Otavio Salvador
2014-04-24 15:59:20 -03:00
committed by Richard Purdie
parent 08a38a7865
commit 4c14b09498
131 changed files with 391 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/default-providers.inc
View File

@@ -39,7 +39,7 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
PREFERRED_PROVIDER_console-tools ?= "kbd"
PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
PREFERRED_PROVIDER_make ?= "make"
PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
# on this rather strange entry.
PREFERRED_PROVIDER_bluez4 ?= "bluez4"

2
meta/conf/machine/include/qemu.inc
View File

@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
XSERVER ?= "xserver-xorg \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
xf86-input-evdev \
xf86-input-mouse \
xf86-video-fbdev \

6
meta/conf/machine/include/x86-base.inc
View File

@@ -33,16 +33,16 @@ XSERVER_X86_BASE = "xserver-xorg \
"
XSERVER_X86_EXT = " \
${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
xserver-xorg-module-libint10 \
"
XSERVER_X86_I915 = "xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \
"
XSERVER_X86_I965 = "xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
"
XSERVER_X86_VESA = "xf86-video-vesa"

2
meta/conf/machine/qemux86-64.conf
View File

@@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
XSERVER = "xserver-xorg \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
xf86-input-vmmouse \
xf86-input-keyboard \
xf86-input-evdev \

2
meta/conf/machine/qemux86.conf
View File

@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
XSERVER = "xserver-xorg \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
xf86-input-vmmouse \
xf86-input-keyboard \
xf86-input-evdev \