From d83b16dbf0862be387f84228710cb165c6d2b03b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:20 -0300 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb | 2 +- meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 ++-- meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 2 +- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 8 ++++---- meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +- meta/recipes-qt/qt4/qt4.inc | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb index 6ef844fc7c..02a649bab4 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb @@ -12,7 +12,7 @@ RPROVIDES_${PN} = "task-qt4e-base" RREPLACES_${PN} = "task-qt4e-base" RCONFLICTS_${PN} = "task-qt4e-base" -TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' +TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' RDEPENDS_${PN} = " \ qt4-embedded \ diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb index c6aa753575..0e7c800946 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb @@ -6,6 +6,6 @@ require packagegroup-qt-toolchain-target.inc RDEPENDS_${PN} += " \ qt4-x11-free-dev \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \ " diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb index 5fe7bc98bd..e7e4b3c62a 100644 --- a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb +++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb @@ -3,7 +3,7 @@ DEPENDS = "qt4-x11-free" SECTION = "x11/libs" qtm_embedded := "" qtm_dir = "qt4" -qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} " +qtm_glflags := "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} " qtm_extra_config := "" inherit qt4x11 diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index ff63d2b0d0..d46acb9c7e 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -1,8 +1,8 @@ HOMEPAGE = "http://qt-project.org/" DEPENDS = "gstreamer util-linux" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" PACKAGECONFIG[bluetooth] = ",,bluez4" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" @@ -65,12 +65,12 @@ maemo5-contacts_enabled = no maemo5-calendar_enabled = no maemo6-landmarks_enabled = no bme_enabled = no -bluez_enabled = ${@base_contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)} +bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)} proj_enabled = no gstreamer-photography_enabled = no gstreamer-appsrc_enabled = yes blkid_enabled = yes -pulseaudio_enabled = ${@base_contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)} +pulseaudio_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)} udev_enabled = yes iphb_enabled = no nfc_symbian_enabled = no diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 73ed2bcbd9..3b1e0fecad 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -10,7 +10,7 @@ QT4DEPENDS = "" INC_PR = "r50" -QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " +QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" QT_GLFLAGS_qemuppc = "-opengl" QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 9a10138e94..0023f16a6c 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -1,7 +1,7 @@ inherit qmake_base DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" require qt4_arch.inc @@ -18,7 +18,7 @@ QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" QT_PHONON ?= "-phonon" QT_DBUS ?= "-qdbus" -QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" +QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ -shared -no-nas-sound -no-nis \ -- cgit 1.2.3-korg