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>
---
 conf/distro/include/rcar-gen2.inc                                     | 4 ++--
 recipes-qt/automotive/gammaray_git.bb                                 | 2 +-
 recipes-qt/automotive/neptune-ui_git.bb                               | 2 +-
 recipes-qt/automotive/qtapplicationmanager_git.bb                     | 4 ++--
 recipes-qt/b2qt-addons/b2qt-demos.bb                                  | 2 +-
 recipes-qt/b2qt-addons/b2qt-launcher.bb                               | 2 +-
 recipes-qt/images/b2qt-automotive-qt5-image.bb                        | 4 ++--
 recipes-qt/images/b2qt-embedded-ci-image.bb                           | 4 ++--
 recipes-qt/images/b2qt-embedded-qt5-image.bb                          | 4 ++--
 recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb       | 2 +-
 recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb         | 2 +-
 .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb  | 4 ++--
 recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb             | 4 ++--
 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 +-
 18 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 2768f88..9705877 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -112,13 +112,13 @@ MACHINE_EXTRA_INSTALL += " \
     gles-kernel-module \
     gles-user-module \
     ${RENESAS_WORKAROUNGS} \
-    ${@base_contains("MACHINE_FEATURES", "multimedia", "${MULTIMEDIA_PACKAGES}", "", d)} \
+    ${@bb.utils.contains("MACHINE_FEATURES", "multimedia", "${MULTIMEDIA_PACKAGES}", "", d)} \
 "
 
 MACHINE_EXTRA_INSTALL_append_lcb = " \
     can-utils \
     libsocketcan \
-    ${@base_contains("MACHINE_FEATURES", "multimedia", "packagegroup-lcb-oss-codecs", "", d)} \
+    ${@bb.utils.contains("MACHINE_FEATURES", "multimedia", "packagegroup-lcb-oss-codecs", "", d)} \
 "
 
 BB_MULTIMEDIA_TEST_MODULE = "\
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index f9fb715..6304096 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -13,7 +13,7 @@ SRCREV = "b961eb1b84718256acc678ec16a2b45e98990cd7"
 PV = "master+git${SRCPV}"
 
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \
-           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index d4ef8e4..2db4765 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -46,7 +46,7 @@ SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f"
 
 DEPENDS = "qtbase qtdeclarative"
 RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
-                  ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
 do_configure_prepend() {
     echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 3b54890..e22196c 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -37,11 +37,11 @@ require recipes-qt/qt5/qt5-git.inc
 SRCREV = "be9e9a37c2cd848cfdbb97990e0047f1a0834a8a"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
-           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 RDEPENDS_${PN} = "libcrypto ${PN}-tools"
 
 EXTRA_QMAKEVARS_PRE += "\
-    ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
     -config install-prefix=/usr \
     -config systemd-workaround \
     -config hardware-id=neptune \
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 3fbc0a0..f133352 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -63,7 +63,7 @@ SRC_URI[video2.sha256sum] = "651e0b4d2b3272dc10bfc9edba4f0c1a7084cd087c75e8a098f
 S = "${WORKDIR}/git/basicsuite"
 
 DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtcanvas3d \
-           ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+           ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
 do_install_append() {
     # we only need plugins from the demos
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index c3f4061..32f569b 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -46,7 +46,7 @@ SRC_URI += " \
 SRCREV = "7ff96b74f8721dbaf50722561770815a4530b6a0"
 
 DEPENDS = "qtbase qtdeclarative \
-           ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+           ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
 do_install_append() {
     install -m 0755 -d ${D}${sysconfdir}/init.d
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 179831a..67819d7 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -48,8 +48,8 @@ inherit consistent_timestamps
 IMAGE_INSTALL += "\
     packagegroup-b2qt-embedded-base \
     packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
     packagegroup-b2qt-qt5-modules \
     packagegroup-b2qt-automotive-addons \
     "
diff --git a/recipes-qt/images/b2qt-embedded-ci-image.bb b/recipes-qt/images/b2qt-embedded-ci-image.bb
index 09dbcf8..32773e1 100644
--- a/recipes-qt/images/b2qt-embedded-ci-image.bb
+++ b/recipes-qt/images/b2qt-embedded-ci-image.bb
@@ -44,8 +44,8 @@ inherit core-image
 IMAGE_INSTALL += "\
     packagegroup-b2qt-embedded-base \
     packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
     packagegroup-b2qt-qt5-modules \
     "
 
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 4d0bfa4..d8743a5 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -48,8 +48,8 @@ inherit consistent_timestamps
 IMAGE_INSTALL += "\
     packagegroup-b2qt-embedded-base \
     packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
     packagegroup-b2qt-qt5-modules \
     packagegroup-b2qt-embedded-addons \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 391224e..1bf8da1 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -39,7 +39,7 @@ RDEPENDS_${PN} += " \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
     gammaray \
     qmllive-target \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 05dc416..8008c89 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -38,6 +38,6 @@ RDEPENDS_${PN} += " \
     b2qt-appcontroller \
     b2qt-launcher \
     b2qt-demos \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
     ${@bb.utils.contains("ENABLE_QDBD", "1", "qdbd", "", d)} \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 48e769a..786b17a 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -68,8 +68,8 @@ RDEPENDS_${PN} += " \
     qttools-dev \
     qttools-staticdev \
     qtvirtualkeyboard-dev \
-    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 2d9eeb6..17ea74b 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -68,8 +68,8 @@ RDEPENDS_${PN} += " \
     qttranslations-qtserialport \
     qttranslations-qtwebsockets \
     qttranslations-qtxmlpatterns \
-    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \
     qtwebsockets \
     qtwebchannel \
     qtxmlpatterns \
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