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:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-connectivity/connman | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-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/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 4bd94f362f..f121a81f1e 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -27,13 +27,13 @@ EXTRA_OECONF += "\ | |||
27 | --enable-test \ | 27 | --enable-test \ |
28 | --disable-polkit \ | 28 | --disable-polkit \ |
29 | --enable-client \ | 29 | --enable-client \ |
30 | ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ | 30 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ |
31 | " | 31 | " |
32 | 32 | ||
33 | PACKAGECONFIG ??= "wispr \ | 33 | PACKAGECONFIG ??= "wispr \ |
34 | ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ | 34 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ |
35 | ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ | 35 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ |
36 | ${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \ | 36 | ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \ |
37 | " | 37 | " |
38 | 38 | ||
39 | # If you want ConnMan to support VPN, add following statement into | 39 | # If you want ConnMan to support VPN, add following statement into |
@@ -81,7 +81,7 @@ do_compile_append() { | |||
81 | } | 81 | } |
82 | 82 | ||
83 | do_install_append() { | 83 | do_install_append() { |
84 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 84 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
85 | install -d ${D}${sysconfdir}/init.d | 85 | install -d ${D}${sysconfdir}/init.d |
86 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | 86 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman |
87 | sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman | 87 | sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman |
@@ -106,16 +106,16 @@ do_install_append() { | |||
106 | RPROVIDES_${PN} = "\ | 106 | RPROVIDES_${PN} = "\ |
107 | connman-plugin-loopback \ | 107 | connman-plugin-loopback \ |
108 | connman-plugin-ethernet \ | 108 | connman-plugin-ethernet \ |
109 | ${@base_contains('PACKAGECONFIG', 'bluetooth','connman-plugin-bluetooth', '', d)} \ | 109 | ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth','connman-plugin-bluetooth', '', d)} \ |
110 | ${@base_contains('PACKAGECONFIG', 'wifi','connman-plugin-wifi', '', d)} \ | 110 | ${@bb.utils.contains('PACKAGECONFIG', 'wifi','connman-plugin-wifi', '', d)} \ |
111 | ${@base_contains('PACKAGECONFIG', '3g','connman-plugin-ofono', '', d)} \ | 111 | ${@bb.utils.contains('PACKAGECONFIG', '3g','connman-plugin-ofono', '', d)} \ |
112 | " | 112 | " |
113 | 113 | ||
114 | RDEPENDS_${PN} = "\ | 114 | RDEPENDS_${PN} = "\ |
115 | dbus \ | 115 | dbus \ |
116 | ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ | 116 | ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ |
117 | ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ | 117 | ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ |
118 | ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \ | 118 | ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ |
119 | xuser-account \ | 119 | xuser-account \ |
120 | " | 120 | " |
121 | 121 | ||
@@ -188,7 +188,7 @@ to create a VPN connection to OpenVPN server." | |||
188 | FILES_${PN}-plugin-vpn-openvpn += "${libdir}/connman/scripts/openvpn-script \ | 188 | FILES_${PN}-plugin-vpn-openvpn += "${libdir}/connman/scripts/openvpn-script \ |
189 | ${libdir}/connman/plugins-vpn/openvpn.so" | 189 | ${libdir}/connman/plugins-vpn/openvpn.so" |
190 | RDEPENDS_${PN}-plugin-vpn-openvpn += "${PN}-vpn" | 190 | RDEPENDS_${PN}-plugin-vpn-openvpn += "${PN}-vpn" |
191 | RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','openvpn','${PN}-plugin-vpn-openvpn', '', d)}" | 191 | RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','openvpn','${PN}-plugin-vpn-openvpn', '', d)}" |
192 | 192 | ||
193 | SUMMARY_${PN}-plugin-vpn-vpnc = "A vpnc plugin for ConnMan VPN" | 193 | SUMMARY_${PN}-plugin-vpn-vpnc = "A vpnc plugin for ConnMan VPN" |
194 | DESCRIPTION_${PN}-plugin-vpn-vpnc = "The ConnMan vpnc plugin uses vpnc client \ | 194 | DESCRIPTION_${PN}-plugin-vpn-vpnc = "The ConnMan vpnc plugin uses vpnc client \ |
@@ -196,7 +196,7 @@ to create a VPN connection to Cisco3000 VPN Concentrator." | |||
196 | FILES_${PN}-plugin-vpn-vpnc += "${libdir}/connman/scripts/openconnect-script \ | 196 | FILES_${PN}-plugin-vpn-vpnc += "${libdir}/connman/scripts/openconnect-script \ |
197 | ${libdir}/connman/plugins-vpn/vpnc.so" | 197 | ${libdir}/connman/plugins-vpn/vpnc.so" |
198 | RDEPENDS_${PN}-plugin-vpn-vpnc += "${PN}-vpn" | 198 | RDEPENDS_${PN}-plugin-vpn-vpnc += "${PN}-vpn" |
199 | RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','vpnc','${PN}-plugin-vpn-vpnc', '', d)}" | 199 | RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','vpnc','${PN}-plugin-vpn-vpnc', '', d)}" |
200 | 200 | ||
201 | SUMMARY_${PN}-plugin-vpn-l2tp = "A L2TP plugin for ConnMan VPN" | 201 | SUMMARY_${PN}-plugin-vpn-l2tp = "A L2TP plugin for ConnMan VPN" |
202 | DESCRIPTION_${PN}-plugin-vpn-l2tp = "The ConnMan L2TP plugin uses xl2tpd daemon \ | 202 | DESCRIPTION_${PN}-plugin-vpn-l2tp = "The ConnMan L2TP plugin uses xl2tpd daemon \ |
@@ -204,7 +204,7 @@ to create a VPN connection to L2TP server." | |||
204 | FILES_${PN}-plugin-vpn-l2tp += "${libdir}/connman/scripts/libppp-plugin.so* \ | 204 | FILES_${PN}-plugin-vpn-l2tp += "${libdir}/connman/scripts/libppp-plugin.so* \ |
205 | ${libdir}/connman/plugins-vpn/l2tp.so" | 205 | ${libdir}/connman/plugins-vpn/l2tp.so" |
206 | RDEPENDS_${PN}-plugin-vpn-l2tp += "${PN}-vpn" | 206 | RDEPENDS_${PN}-plugin-vpn-l2tp += "${PN}-vpn" |
207 | RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','l2tp','${PN}-plugin-vpn-l2tp', '', d)}" | 207 | RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','l2tp','${PN}-plugin-vpn-l2tp', '', d)}" |
208 | 208 | ||
209 | SUMMARY_${PN}-plugin-vpn-pptp = "A PPTP plugin for ConnMan VPN" | 209 | SUMMARY_${PN}-plugin-vpn-pptp = "A PPTP plugin for ConnMan VPN" |
210 | DESCRIPTION_${PN}-plugin-vpn-pptp = "The ConnMan PPTP plugin uses pptp-linux client \ | 210 | DESCRIPTION_${PN}-plugin-vpn-pptp = "The ConnMan PPTP plugin uses pptp-linux client \ |
@@ -212,4 +212,4 @@ to create a VPN connection to PPTP server." | |||
212 | FILES_${PN}-plugin-vpn-pptp += "${libdir}/connman/scripts/libppp-plugin.so* \ | 212 | FILES_${PN}-plugin-vpn-pptp += "${libdir}/connman/scripts/libppp-plugin.so* \ |
213 | ${libdir}/connman/plugins-vpn/pptp.so" | 213 | ${libdir}/connman/plugins-vpn/pptp.so" |
214 | RDEPENDS_${PN}-plugin-vpn-pptp += "${PN}-vpn" | 214 | RDEPENDS_${PN}-plugin-vpn-pptp += "${PN}-vpn" |
215 | RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)}" | 215 | RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)}" |