diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:10:58 +0100 |
commit | d83b16dbf0862be387f84228710cb165c6d2b03b (patch) | |
tree | 37a594f2efa42513359e45477ab0b69857226563 /meta/recipes-connectivity/neard | |
parent | 93499ebc46547f5bf6dcecd5a786ead9f726de28 (diff) | |
download | openembedded-core-d83b16dbf0862be387f84228710cb165c6d2b03b.tar.gz openembedded-core-d83b16dbf0862be387f84228710cb165c6d2b03b.tar.bz2 openembedded-core-d83b16dbf0862be387f84228710cb165c6d2b03b.zip |
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 <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/neard')
-rw-r--r-- | meta/recipes-connectivity/neard/neard.inc | 8 |
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() { # This would copy neard start-stop shell and test scripts do_install_append() { - 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/ sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \ > ${D}${sysconfdir}/init.d/neard chmod 0755 ${D}${sysconfdir}/init.d/neard fi - 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 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \ > ${D}${systemd_unitdir}/system/neard.service @@ -47,8 +47,8 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" # Bluez & Wifi are not mandatory except for handover RRECOMMENDS_${PN} = "\ - ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ " RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" |