summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc2
-rw-r--r--meta/recipes-connectivity/neard/neard_0.16.bb2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb2
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.4p1.bb4
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc4
7 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7fa9a7b93c..64a5418c63 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -31,10 +31,8 @@ EXTRA_OECONF += "\
31" 31"
32 32
33PACKAGECONFIG ??= "wispr \ 33PACKAGECONFIG ??= "wispr \
34 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ 34 ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
37 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
38" 36"
39 37
40# If you want ConnMan to support VPN, add following statement into 38# If you want ConnMan to support VPN, add following statement into
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 4453a9e2ae..6635779247 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--with-pcap=linux"
22EXTRA_AUTORECONF += "--exclude=aclocal" 22EXTRA_AUTORECONF += "--exclude=aclocal"
23 23
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 25 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
26" 26"
27PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" 27PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
28# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. 28# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb
index 5433dc3c3e..d6157a8965 100644
--- a/meta/recipes-connectivity/neard/neard_0.16.bb
+++ b/meta/recipes-connectivity/neard/neard_0.16.bb
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
19 19
20inherit autotools pkgconfig systemd update-rc.d bluetooth 20inherit autotools pkgconfig systemd update-rc.d bluetooth
21 21
22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
23 23
24PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" 24PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
25 25
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index 4a45accaa9..4ca9ab2a3d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -63,7 +63,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \
63 " 63 "
64 64
65PACKAGECONFIG ??= "tcp-wrappers \ 65PACKAGECONFIG ??= "tcp-wrappers \
66 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 66 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
67" 67"
68PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" 68PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
69PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" 69PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 9c47c6fde5..676a0c0042 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -13,7 +13,7 @@ INITSCRIPT_NAME = "ofono"
13INITSCRIPT_PARAMS = "defaults 22" 13INITSCRIPT_PARAMS = "defaults 22"
14 14
15PACKAGECONFIG ??= "\ 15PACKAGECONFIG ??= "\
16 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 16 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
18 " 18 "
19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
diff --git a/meta/recipes-connectivity/openssh/openssh_7.4p1.bb b/meta/recipes-connectivity/openssh/openssh_7.4p1.bb
index 3b3d667a68..c8093d4e2b 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.4p1.bb
@@ -91,12 +91,12 @@ do_compile_ptest() {
91} 91}
92 92
93do_install_append () { 93do_install_append () {
94 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 94 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
95 install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd 95 install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
96 sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config 96 sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config
97 fi 97 fi
98 98
99 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then 99 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
100 sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config 100 sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config
101 fi 101 fi
102 102
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index fc55925615..0b7991d1fd 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -37,7 +37,7 @@ FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
37FILES_libssl = "${libdir}/libssl${SOLIBS}" 37FILES_libssl = "${libdir}/libssl${SOLIBS}"
38FILES_${PN} =+ " ${libdir}/ssl/*" 38FILES_${PN} =+ " ${libdir}/ssl/*"
39FILES_${PN}-misc = "${libdir}/ssl/misc" 39FILES_${PN}-misc = "${libdir}/ssl/misc"
40RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" 40RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
41 41
42# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 42# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
43# package RRECOMMENDS on this package. This will enable the configuration 43# package RRECOMMENDS on this package. This will enable the configuration
@@ -185,7 +185,7 @@ do_install () {
185 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash 185 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
186 186
187 oe_multilib_header openssl/opensslconf.h 187 oe_multilib_header openssl/opensslconf.h
188 if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then 188 if [ "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" ]; then
189 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl 189 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
190 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget 190 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
191 else 191 else