summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 18:59:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 16:19:19 (GMT)
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-connectivity
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')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc4
-rw-r--r--meta/recipes-connectivity/bind/bind_9.9.5.bb2
-rw-r--r--meta/recipes-connectivity/bluez/bluez4.inc4
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman.inc30
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc2
-rw-r--r--meta/recipes-connectivity/neard/neard.inc8
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc6
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.5p1.bb10
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc4
-rw-r--r--meta/recipes-connectivity/portmap/portmap_6.0.bb2
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb2
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc2
13 files changed, 40 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 6f89441..3318f40 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -58,8 +58,8 @@ EXTRA_OECONF = "--disable-introspection \
58 " 58 "
59 59
60# The distro choice determines what init scripts are installed 60# The distro choice determines what init scripts are installed
61EXTRA_OECONF_SYSVINIT = "${@base_contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" 61EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
62EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 62EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
63 63
64AVAHI_GTK ?= "--disable-gtk --disable-gtk3" 64AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
65 65
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index 053c352..65ec232 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -21,7 +21,7 @@ SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
21SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1" 21SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1"
22 22
23# --enable-exportlib is necessary for building dhcp 23# --enable-exportlib is necessary for building dhcp
24ENABLE_IPV6 = "--enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" 24ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
25EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ 25EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
26 --disable-devpoll --disable-epoll --with-gost=no \ 26 --disable-devpoll --disable-epoll --with-gost=no \
27 --with-gssapi=no --with-ecdsa=yes \ 27 --with-gssapi=no --with-ecdsa=yes \
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 0827005..321fddb 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -11,8 +11,8 @@ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
11RDEPENDS_${PN}-dev = "bluez-hcidump" 11RDEPENDS_${PN}-dev = "bluez-hcidump"
12 12
13PACKAGECONFIG ??= "\ 13PACKAGECONFIG ??= "\
14 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
15 ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ 15 ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
16" 16"
17PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 17PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
18PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," 18PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 2b832ef..fa6f08b 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -10,7 +10,7 @@ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
10 10
11RCONFLICTS_${PN} = "bluez4" 11RCONFLICTS_${PN} = "bluez4"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
14PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" 14PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
15 15
16SRC_URI = "\ 16SRC_URI = "\
@@ -26,7 +26,7 @@ EXTRA_OECONF = "\
26 --disable-cups \ 26 --disable-cups \
27 --enable-test \ 27 --enable-test \
28 --enable-datafiles \ 28 --enable-datafiles \
29 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \
30 --enable-library \ 30 --enable-library \
31" 31"
32 32
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 4bd94f3..f121a81 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
33PACKAGECONFIG ??= "wispr \ 33PACKAGECONFIG ??= "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
83do_install_append() { 83do_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() {
106RPROVIDES_${PN} = "\ 106RPROVIDES_${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
114RDEPENDS_${PN} = "\ 114RDEPENDS_${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."
188FILES_${PN}-plugin-vpn-openvpn += "${libdir}/connman/scripts/openvpn-script \ 188FILES_${PN}-plugin-vpn-openvpn += "${libdir}/connman/scripts/openvpn-script \
189 ${libdir}/connman/plugins-vpn/openvpn.so" 189 ${libdir}/connman/plugins-vpn/openvpn.so"
190RDEPENDS_${PN}-plugin-vpn-openvpn += "${PN}-vpn" 190RDEPENDS_${PN}-plugin-vpn-openvpn += "${PN}-vpn"
191RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','openvpn','${PN}-plugin-vpn-openvpn', '', d)}" 191RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','openvpn','${PN}-plugin-vpn-openvpn', '', d)}"
192 192
193SUMMARY_${PN}-plugin-vpn-vpnc = "A vpnc plugin for ConnMan VPN" 193SUMMARY_${PN}-plugin-vpn-vpnc = "A vpnc plugin for ConnMan VPN"
194DESCRIPTION_${PN}-plugin-vpn-vpnc = "The ConnMan vpnc plugin uses vpnc client \ 194DESCRIPTION_${PN}-plugin-vpn-vpnc = "The ConnMan vpnc plugin uses vpnc client \
@@ -196,7 +196,7 @@ to create a VPN connection to Cisco3000 VPN Concentrator."
196FILES_${PN}-plugin-vpn-vpnc += "${libdir}/connman/scripts/openconnect-script \ 196FILES_${PN}-plugin-vpn-vpnc += "${libdir}/connman/scripts/openconnect-script \
197 ${libdir}/connman/plugins-vpn/vpnc.so" 197 ${libdir}/connman/plugins-vpn/vpnc.so"
198RDEPENDS_${PN}-plugin-vpn-vpnc += "${PN}-vpn" 198RDEPENDS_${PN}-plugin-vpn-vpnc += "${PN}-vpn"
199RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','vpnc','${PN}-plugin-vpn-vpnc', '', d)}" 199RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','vpnc','${PN}-plugin-vpn-vpnc', '', d)}"
200 200
201SUMMARY_${PN}-plugin-vpn-l2tp = "A L2TP plugin for ConnMan VPN" 201SUMMARY_${PN}-plugin-vpn-l2tp = "A L2TP plugin for ConnMan VPN"
202DESCRIPTION_${PN}-plugin-vpn-l2tp = "The ConnMan L2TP plugin uses xl2tpd daemon \ 202DESCRIPTION_${PN}-plugin-vpn-l2tp = "The ConnMan L2TP plugin uses xl2tpd daemon \
@@ -204,7 +204,7 @@ to create a VPN connection to L2TP server."
204FILES_${PN}-plugin-vpn-l2tp += "${libdir}/connman/scripts/libppp-plugin.so* \ 204FILES_${PN}-plugin-vpn-l2tp += "${libdir}/connman/scripts/libppp-plugin.so* \
205 ${libdir}/connman/plugins-vpn/l2tp.so" 205 ${libdir}/connman/plugins-vpn/l2tp.so"
206RDEPENDS_${PN}-plugin-vpn-l2tp += "${PN}-vpn" 206RDEPENDS_${PN}-plugin-vpn-l2tp += "${PN}-vpn"
207RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','l2tp','${PN}-plugin-vpn-l2tp', '', d)}" 207RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','l2tp','${PN}-plugin-vpn-l2tp', '', d)}"
208 208
209SUMMARY_${PN}-plugin-vpn-pptp = "A PPTP plugin for ConnMan VPN" 209SUMMARY_${PN}-plugin-vpn-pptp = "A PPTP plugin for ConnMan VPN"
210DESCRIPTION_${PN}-plugin-vpn-pptp = "The ConnMan PPTP plugin uses pptp-linux client \ 210DESCRIPTION_${PN}-plugin-vpn-pptp = "The ConnMan PPTP plugin uses pptp-linux client \
@@ -212,4 +212,4 @@ to create a VPN connection to PPTP server."
212FILES_${PN}-plugin-vpn-pptp += "${libdir}/connman/scripts/libppp-plugin.so* \ 212FILES_${PN}-plugin-vpn-pptp += "${libdir}/connman/scripts/libppp-plugin.so* \
213 ${libdir}/connman/plugins-vpn/pptp.so" 213 ${libdir}/connman/plugins-vpn/pptp.so"
214RDEPENDS_${PN}-plugin-vpn-pptp += "${PN}-vpn" 214RDEPENDS_${PN}-plugin-vpn-pptp += "${PN}-vpn"
215RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)}" 215RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)}"
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index a984e05..177b70f 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" 10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
11DEPENDS = "flex-native bison-native libnl" 11DEPENDS = "flex-native bison-native libnl"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
14PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4" 14PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
15PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" 15PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
16PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1" 16PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 1dde1da..e714cad 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"
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 3972e06..9f65f4f 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
7 7
8inherit autotools pkgconfig update-rc.d systemd 8inherit autotools pkgconfig update-rc.d systemd
9 9
10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}" 10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}"
11 11
12INITSCRIPT_NAME = "ofono" 12INITSCRIPT_NAME = "ofono"
13INITSCRIPT_PARAMS = "defaults 22" 13INITSCRIPT_PARAMS = "defaults 22"
14 14
15EXTRA_OECONF += "\ 15EXTRA_OECONF += "\
16 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
18 --enable-test \ 18 --enable-test \
19" 19"
20SYSTEMD_SERVICE_${PN} = "ofono.service" 20SYSTEMD_SERVICE_${PN} = "ofono.service"
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index 3b10164..b93b9ae 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9 9
10DEPENDS = "zlib openssl" 10DEPENDS = "zlib openssl"
11DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
12 12
13RPROVIDES_${PN}-ssh = "ssh" 13RPROVIDES_${PN}-ssh = "ssh"
14RPROVIDES_${PN}-sshd = "sshd" 14RPROVIDES_${PN}-sshd = "sshd"
@@ -23,7 +23,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
23 file://ssh_config \ 23 file://ssh_config \
24 file://init \ 24 file://init \
25 file://openssh-CVE-2011-4327.patch \ 25 file://openssh-CVE-2011-4327.patch \
26 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
27 file://sshd.socket \ 27 file://sshd.socket \
28 file://sshd@.service \ 28 file://sshd@.service \
29 file://sshdgenkeys.service \ 29 file://sshdgenkeys.service \
@@ -58,7 +58,7 @@ export LD = "${CC}"
58 58
59# login path is hardcoded in sshd 59# login path is hardcoded in sshd
60EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ 60EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
61 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ 61 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
62 --without-zlib-version-check \ 62 --without-zlib-version-check \
63 --with-privsep-path=/var/run/sshd \ 63 --with-privsep-path=/var/run/sshd \
64 --sysconfdir=${sysconfdir}/ssh \ 64 --sysconfdir=${sysconfdir}/ssh \
@@ -90,7 +90,7 @@ do_compile_append () {
90} 90}
91 91
92do_install_append () { 92do_install_append () {
93 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 93 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
94 install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd 94 install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
95 sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config 95 sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config
96 fi 96 fi
@@ -138,7 +138,7 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
138FILES_${PN}-keygen = "${bindir}/ssh-keygen" 138FILES_${PN}-keygen = "${bindir}/ssh-keygen"
139 139
140RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" 140RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
141RDEPENDS_${PN}-sshd += "${PN}-keygen ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" 141RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
142RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" 142RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
143 143
144CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" 144CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index ee02fb7..229ec87 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -37,7 +37,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
37FILES_libssl = "${libdir}/libssl.so.*" 37FILES_libssl = "${libdir}/libssl.so.*"
38FILES_${PN} =+ " ${libdir}/ssl/*" 38FILES_${PN} =+ " ${libdir}/ssl/*"
39FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" 39FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
40RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" 40RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" 41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
42 42
43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
@@ -157,7 +157,7 @@ do_install () {
157 cp --dereference -R include/openssl ${D}${includedir} 157 cp --dereference -R include/openssl ${D}${includedir}
158 158
159 oe_multilib_header openssl/opensslconf.h 159 oe_multilib_header openssl/opensslconf.h
160 if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then 160 if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
161 install -m 0755 ${S}/tools/c_rehash ${D}${bindir} 161 install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
162 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash 162 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
163 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl 163 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index 68dd796..b0a9454 100644
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
@@ -17,7 +17,7 @@ PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers"
17 17
18CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS" 18CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS"
19CFLAGS += "-Wall -Wstrict-prototypes -fPIC" 19CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
20EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@base_contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'" 20EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'"
21 21
22fakeroot do_install() { 22fakeroot do_install() {
23 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d 23 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
index 5897e40..68bd515 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
@@ -26,7 +26,7 @@ do_install () {
26 install -d ${D}${sysconfdir}/default/volatiles 26 install -d ${D}${sysconfdir}/default/volatiles
27 echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \ 27 echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \
28 > ${D}${sysconfdir}/default/volatiles/99_resolvconf 28 > ${D}${sysconfdir}/default/volatiles/99_resolvconf
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}${sysconfdir}/tmpfiles.d 30 install -d ${D}${sysconfdir}/tmpfiles.d
31 echo "d /run/${BPN}/interface - - - -" \ 31 echo "d /run/${BPN}/interface - - - -" \
32 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf 32 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
index 11e8287..6eb3d2d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
@@ -73,7 +73,7 @@ do_install () {
73 install -d ${D}/${datadir}/dbus-1/system-services 73 install -d ${D}/${datadir}/dbus-1/system-services
74 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services 74 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
75 75
76 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 76 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
77 install -d ${D}/${systemd_unitdir}/system 77 install -d ${D}/${systemd_unitdir}/system
78 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system 78 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
79 fi 79 fi