diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:49 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:38 +0200 |
commit | 21f10c11f39020f9502d741c774a12d1aeb39499 (patch) | |
tree | fdc66c039950da89d82b6b7405ebfc50cbba693a /meta-oe/recipes-connectivity | |
parent | 723b55f5c1f7df21dbcfa7cb2dcaecb10d886041 (diff) | |
download | meta-openembedded-21f10c11f39020f9502d741c774a12d1aeb39499.tar.gz |
meta-oe: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb index acae8689d..cfd794de5 100644 --- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +++ b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" | |||
8 | DEPENDS = "glib-2.0" | 8 | DEPENDS = "glib-2.0" |
9 | X11DEPENDS = " libxpm gtk+" | 9 | X11DEPENDS = " libxpm gtk+" |
10 | 10 | ||
11 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 11 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
12 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" | 12 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" |
13 | PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" | 13 | PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" |
14 | PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" | 14 | PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" |
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb index 34c2969d4..1165b11e4 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb | |||
@@ -85,7 +85,7 @@ do_install_append() { | |||
85 | mkdir -p ${D}/${sysconfdir}/default/volatiles | 85 | mkdir -p ${D}/${sysconfdir}/default/volatiles |
86 | echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ | 86 | echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ |
87 | > ${D}${sysconfdir}/default/volatiles/87_krb5 | 87 | > ${D}${sysconfdir}/default/volatiles/87_krb5 |
88 | if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 88 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
89 | install -d ${D}${sysconfdir}/tmpfiles.d | 89 | install -d ${D}${sysconfdir}/tmpfiles.d |
90 | echo "d /run/krb5kdc - - - -" \ | 90 | echo "d /run/krb5kdc - - - -" \ |
91 | > ${D}${sysconfdir}/tmpfiles.d/krb5.conf | 91 | > ${D}${sysconfdir}/tmpfiles.d/krb5.conf |
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb index 857895b00..b5df8e0dd 100644 --- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb +++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb | |||
@@ -39,7 +39,7 @@ inherit autotools pkgconfig lib_package | |||
39 | EXTRA_OECONF += "--disable-rpath" | 39 | EXTRA_OECONF += "--disable-rpath" |
40 | 40 | ||
41 | PACKAGECONFIG ?= "\ | 41 | PACKAGECONFIG ?= "\ |
42 | ${@base_contains('DISTRO_FEATURES', 'largefile$', 'largefile', '', d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'largefile$', 'largefile', '', d)} \ |
43 | " | 43 | " |
44 | PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen" | 44 | PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen" |
45 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" | 45 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" |
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb index e55c37706..c2c4eaefa 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb | |||
@@ -60,7 +60,7 @@ do_configure_prepend() { | |||
60 | } | 60 | } |
61 | 61 | ||
62 | do_install_append() { | 62 | do_install_append() { |
63 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 63 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
64 | install -d ${D}${systemd_unitdir}/system | 64 | install -d ${D}${systemd_unitdir}/system |
65 | install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ | 65 | install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ |
66 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service | 66 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service |