From 083d70c03bacdadf32a3bec5535154b028dee022 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Thu, 26 Jan 2017 12:13:21 +0200
Subject: Replace @base_contains macros with @bb.utils.contains

Deprecated @base_contains macros print warnings.
Replace deprecated macro with @bb.utils.contains
everywhere (.bb, .append, .conf and .inc files)

Change-Id: I400f8b355150e0f283165fbf43fb620f948892fa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 recipes/dbus/dbus_%.bbappend                                          | 4 ++--
 recipes/ostree/ostree.bb                                              | 2 +-
 .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb            | 2 +-
 recipes/packagegroup/packagegroup-b2qt-embedded-base.bb               | 2 +-
 recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'recipes')

diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index dde2927..64d750c 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -52,12 +52,12 @@ FILES_${PN}-session-init = " \
 do_install_append_class-target() {
     sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
 
-    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
     fi
 
-    if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -m 0755 -d ${D}${bindir}/
         install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/
 
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 5de3852..6a4323d 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -57,7 +57,7 @@ DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
 RDEPENDS_${PN} += "bash"
 RRECOMMENDS_${PN} += "gnupg"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,"
 
 SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 5e3234f..cc25bd4 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -50,7 +50,7 @@ RDEPENDS_${PN}_append_linux = "\
     nativesdk-python-modules \
     nativesdk-python-misc \
     nativesdk-perl-modules \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \
     "
 
 RDEPENDS_${PN}_append_mingw32 = "\
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 0309991..066ba29 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -51,6 +51,6 @@ RDEPENDS_${PN} = "\
         tzdata-asia \
         tzdata-europe \
         connman \
-        ${@base_contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
+        ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
         ${MACHINE_EXTRA_INSTALL} \
         "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 82f67b0..3fb32cb 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -48,5 +48,5 @@ RDEPENDS_${PN} = "\
         perf \
         rsync \
         tslib-calibrate \
-        ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
+        ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
         "
-- 
cgit v1.2.3-54-g00ecf