summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/neard/neard.inc
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-connectivity/neard/neard.inc
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz
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. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/neard/neard.inc')
-rw-r--r--meta/recipes-connectivity/neard/neard.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 1dde1da377..e714cadc2b 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -19,14 +19,14 @@ do_install() {
19 19
20# This would copy neard start-stop shell and test scripts 20# This would copy neard start-stop shell and test scripts
21do_install_append() { 21do_install_append() {
22 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 22 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
23 install -d ${D}${sysconfdir}/init.d/ 23 install -d ${D}${sysconfdir}/init.d/
24 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \ 24 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
25 > ${D}${sysconfdir}/init.d/neard 25 > ${D}${sysconfdir}/init.d/neard
26 chmod 0755 ${D}${sysconfdir}/init.d/neard 26 chmod 0755 ${D}${sysconfdir}/init.d/neard
27 fi 27 fi
28 28
29 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 29 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
30 install -d ${D}${systemd_unitdir}/system 30 install -d ${D}${systemd_unitdir}/system
31 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \ 31 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
32 > ${D}${systemd_unitdir}/system/neard.service 32 > ${D}${systemd_unitdir}/system/neard.service
@@ -47,8 +47,8 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
47 47
48# Bluez & Wifi are not mandatory except for handover 48# Bluez & Wifi are not mandatory except for handover
49RRECOMMENDS_${PN} = "\ 49RRECOMMENDS_${PN} = "\
50 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ 50 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
51 ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ 51 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
52 " 52 "
53 53
54RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" 54RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"