recipes: use bb.utils.contains instead of base_contains

base_contains is simply a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
index 937f1a15..36b75b2c 100644
--- a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
+++ b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb
@@ -17,7 +17,7 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 SRC_URI[md5sum] = "cd3db8370caa3e607614ea4e74d4c350"
 SRC_URI[sha256sum] = "48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f"
 
-PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri"
 
 RDEPENDS_${PN} = "xserver-xorg-module-exa"
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc
index 6683a7b0..7a298902 100644
--- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc
+++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc
@@ -23,9 +23,9 @@ PACKAGES =+ "${PN}-tests"
 EXTRA_OECONF += "--disable-builtin-libvpx"
 
 PACKAGECONFIG ??= "drm \
-                   ${@base_contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \
-                   ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \
-                   ${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
+                   ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
 
 PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm"
 PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa"
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb
index 118d20b8..403329bc 100644
--- a/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb
+++ b/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb
@@ -20,8 +20,8 @@ SRC_URI[sha256sum] = "9d19d6c789a9a4fbce23c4f0eaf993ba776b512bec4c87982ab17ac841
 
 inherit autotools pkgconfig
 
-PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
-                   ${@base_contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}"
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11"
 PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland virtual/egl"
 
diff --git a/common/recipes-multimedia/libva/libva_1.7.0.bb b/common/recipes-multimedia/libva/libva_1.7.0.bb
index 6cb59eb6..d6eb1edb 100644
--- a/common/recipes-multimedia/libva/libva_1.7.0.bb
+++ b/common/recipes-multimedia/libva/libva_1.7.0.bb
@@ -28,8 +28,8 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-dummy-driver"
 
-PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
-                   ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes"
 PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
 
diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb
index 93df94d2..0c90148f 100644
--- a/common/recipes-multimedia/libva/va-intel.bb
+++ b/common/recipes-multimedia/libva/va-intel.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 def map_valibs(d):
     # The intel implementation requires the libva-intel-driver package
-    if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
+    if bb.utils.contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
        return "libva libva-intel-driver"
     # All meta-intel video acceleration requires libva
     return "libva"
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
index 7dac817e..a3131964 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
@@ -21,9 +21,9 @@ PACKAGECONFIG[dpdk_qat] = ",,virtual/qat"
 PACKAGECONFIG[vhost] = ",,fuse"
 PACKAGECONFIG[libvirt] = ",,libvirt"
 
-export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
-export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
-export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
+export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
+export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
+export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
 
 RDEPENDS_${PN} += "python-subprocess"
 DEPENDS = "virtual/kernel"