aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@windriver.com>2014-10-01 21:53:17 +0200
committerHolger Behrens <holger.behrens@windriver.com>2014-10-17 17:29:11 +0200
commit1c1c9c577d33436d42239104e70ae551eb3712a3 (patch)
treea995ea9824ea74e98245fb20032f787e6745bf03
parent983ebe7d6e70b2236dba0e67aae2b66eae90378a (diff)
downloadmeta-ivi-1c1c9c577d33436d42239104e70ae551eb3712a3.tar.gz
meta-ivi-1c1c9c577d33436d42239104e70ae551eb3712a3.tar.bz2
meta-ivi-1c1c9c577d33436d42239104e70ae551eb3712a3.zip
Globally replace 'base_contains' calls by 'bb.utils.contains'
Based on oe-core commit: commit 1528e596d4906c33e4be83fcf691cfe76d340ff3 Author: Otavio Salvador <ota...@ossystems.com.br> Date: Thu Apr 24 15:59:20 2014 -0300 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: Andrei Gherzan <andrei.gherzan@windriver.com> Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
-rw-r--r--meta-ivi-demo/recipes-qt/qt5/qtbase_5.%.bbappend2
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf6
-rw-r--r--meta-ivi/recipes-connectivity/connman/connman_%.bbappend2
-rw-r--r--meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.10.0.bb2
-rw-r--r--meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb2
-rw-r--r--meta-ivi/recipes-graphics/layer-management/layer-management_1.1.bb2
-rw-r--r--meta-ivi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend2
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb2
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager_git.bb2
-rw-r--r--meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend4
-rw-r--r--meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_104.bb2
11 files changed, 14 insertions, 14 deletions
diff --git a/meta-ivi-demo/recipes-qt/qt5/qtbase_5.%.bbappend b/meta-ivi-demo/recipes-qt/qt5/qtbase_5.%.bbappend
index 253b31c..ce2dbd0 100644
--- a/meta-ivi-demo/recipes-qt/qt5/qtbase_5.%.bbappend
+++ b/meta-ivi-demo/recipes-qt/qt5/qtbase_5.%.bbappend
@@ -2,5 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
DEPENDS_append_koelsch = " libegl"
-PACKAGECONFIG_GL = "${@base_contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
+PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
PACKAGECONFIG_append = " icu"
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 2d0eab5..e9b8f16 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -46,9 +46,9 @@ XSERVER ?= "xserver-xorg \
xf86-input-mouse \
xf86-input-keyboard \
mesa-driver-swrast \
- ${@base_contains("MACHINE_ARCH", "qemux86", "xf86-video-vmware", "", d)} \
- ${@base_contains("MACHINE_ARCH", "qemux86_64", "xf86-video-vmware", "", d)} \
- ${@base_contains("MACHINE_ARCH", "vexpressa9", "xf86-video-fbdev", "", d)} \
+ ${@bb.utils.contains("MACHINE_ARCH", "qemux86", "xf86-video-vmware", "", d)} \
+ ${@bb.utils.contains("MACHINE_ARCH", "qemux86_64", "xf86-video-vmware", "", d)} \
+ ${@bb.utils.contains("MACHINE_ARCH", "vexpressa9", "xf86-video-fbdev", "", d)} \
"
PREMIRRORS ??= "\
diff --git a/meta-ivi/recipes-connectivity/connman/connman_%.bbappend b/meta-ivi/recipes-connectivity/connman/connman_%.bbappend
index d2f8e8e..e0d374e 100644
--- a/meta-ivi/recipes-connectivity/connman/connman_%.bbappend
+++ b/meta-ivi/recipes-connectivity/connman/connman_%.bbappend
@@ -1,6 +1,6 @@
PACKAGECONFIG_remove = "bluetooth"
PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez5"
RDEPENDS_${PN}_remove = "bluez4"
-RDEPENDS_${PN} += "${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez5', '', d)}"
+RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez5', '', d)}"
PR = "r1" \ No newline at end of file
diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.10.0.bb b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.10.0.bb
index 8543461..e9d336e 100644
--- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.10.0.bb
+++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.10.0.bb
@@ -45,7 +45,7 @@ EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON"
do_install_append() {
sed -i '/User/d' ${D}/${systemd_unitdir}/system/*.service
- if [ ${@base_contains('EXTRA_OECMAKE', '-DWITH_SYSTEMD=ON', 'yes', 'no', d)} = yes ]; then
+ if [ ${@bb.utils.contains('EXTRA_OECMAKE', '-DWITH_SYSTEMD=ON', 'yes', 'no', d)} = yes ]; then
# Install the required systemd services links
install -d ${D}${base_libdir}/systemd/system/basic.target.wants
ln -sf ../dlt.service ${D}${base_libdir}/systemd/system/basic.target.wants/dlt.service
diff --git a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb
index ca2dbf1..19ca96d 100644
--- a/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb
+++ b/meta-ivi/recipes-extended/node-state-manager/node-state-manager_2.0.0.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://git.projects.genivi.org/lifecycle/node-state-manager.git \
PR = "r1"
-EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}"
+EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}"
DEPENDS = "dbus glib-2.0 dlt-daemon persistence-client-library systemd"
diff --git a/meta-ivi/recipes-graphics/layer-management/layer-management_1.1.bb b/meta-ivi/recipes-graphics/layer-management/layer-management_1.1.bb
index 3b6e706..655ec96 100644
--- a/meta-ivi/recipes-graphics/layer-management/layer-management_1.1.bb
+++ b/meta-ivi/recipes-graphics/layer-management/layer-management_1.1.bb
@@ -50,7 +50,7 @@ FILES_${PN}-dbg += " \
"
do_install_append() {
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/layermanager.service ${D}${systemd_unitdir}/system
fi
diff --git a/meta-ivi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-ivi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 93b9600..131b36e 100644
--- a/meta-ivi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-ivi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -7,7 +7,7 @@ SYSTEMD_SERVICE = "X.service"
SRC_URI_append = " file://X.service \
"
do_install_append() {
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/X.service ${D}${systemd_unitdir}/system
fi
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb
index 86bcd18..cb7a896 100644
--- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_6.1.bb
@@ -34,7 +34,7 @@ FILES_${PN}-dbg += "${libdir}/audioManager/command/.debug/* \
${libdir}/audioManager/routing/.debug/* \
"
do_install_append() {
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
mkdir -p ${D}${systemd_unitdir}/scripts/
install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh
install -d ${D}${systemd_unitdir}/system/
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_git.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_git.bb
index d103ba7..1c77a12 100644
--- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_git.bb
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_git.bb
@@ -35,7 +35,7 @@ FILES_${PN}-dbg += "${libdir}/audioManager/command/.debug/* \
${libdir}/audioManager/routing/.debug/* \
"
do_install_append() {
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
mkdir -p ${D}${systemd_unitdir}/scripts/
install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh
install -d ${D}${systemd_unitdir}/system/
diff --git a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend b/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend
index e32efa7..ce298f8 100644
--- a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend
+++ b/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend
@@ -14,7 +14,7 @@ PACKAGECONFIG_append = " bluez5"
RDEPENDS_pulseaudio-module-systemd-login =+ "systemd"
RDEPENDS_pulseaudio-server += "\
- ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-systemd-login', '', d)}"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-systemd-login', '', d)}"
python __anonymous () {
'''
@@ -32,7 +32,7 @@ python __anonymous () {
}
do_install_append() {
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/pulseaudio.service ${D}${systemd_unitdir}/system
fi
diff --git a/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_104.bb b/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_104.bb
index 1b4ace4..cde24e3 100644
--- a/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_104.bb
+++ b/meta-ivi/recipes-support-ivi/ecryptfs-utils/ecryptfs-utils_104.bb
@@ -39,7 +39,7 @@ FILES_${PN}-dbg += "${libdir}/ecryptfs/.debug \
${libdir}/security/.debug \
"
do_install_append() {
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/ecryptfs.service ${D}${systemd_unitdir}/system
fi