diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-03-01 18:30:49 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-07 13:30:26 +0100 |
commit | 0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch) | |
tree | 362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-networking/recipes-connectivity | |
parent | b4524eb786472e69e28212a58a329a5e44e40547 (diff) | |
download | meta-openembedded-0c31f55bcfd6630d894dd2dda6ca483bea5de4ab.tar.gz |
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
5 files changed, 6 insertions, 7 deletions
diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 3ed3aab98..952d7a42d 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ | |||
20 | EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ | 20 | EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ |
21 | --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" | 21 | --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" |
22 | 22 | ||
23 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 23 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
24 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 24 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
25 | 25 | ||
26 | SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" | 26 | SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" |
diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb index 197dfb1a4..cb3b5c22f 100644 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb +++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb | |||
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f | |||
14 | 14 | ||
15 | inherit autotools-brokensep | 15 | inherit autotools-brokensep |
16 | 16 | ||
17 | PACKAGECONFIG ?= "udev ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" | 17 | PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
18 | 18 | ||
19 | PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" | 19 | PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" |
20 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" | 20 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" |
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb index e3f5aa396..b42b197fd 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | |||
@@ -34,7 +34,7 @@ acpaths = "-I ./m4" | |||
34 | SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" | 34 | SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" |
35 | 35 | ||
36 | PACKAGECONFIG ??= "ftp uucpd \ | 36 | PACKAGECONFIG ??= "ftp uucpd \ |
37 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 37 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ |
38 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ | 38 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ |
39 | " | 39 | " |
40 | PACKAGECONFIG[ftp] = "--enable-ftp,--disable-ftp,readline" | 40 | PACKAGECONFIG[ftp] = "--enable-ftp,--disable-ftp,readline" |
@@ -153,7 +153,7 @@ ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" | |||
153 | ALTERNATIVE_${PN}-ping = "ping" | 153 | ALTERNATIVE_${PN}-ping = "ping" |
154 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 154 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
155 | 155 | ||
156 | ALTERNATIVE_${PN}-ping6 = "${@bb.utils.contains('PACKAGECONFIG', 'ping6', 'ping6', '', d)}" | 156 | ALTERNATIVE_${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" |
157 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" | 157 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" |
158 | 158 | ||
159 | 159 | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index 0ba59c7d3..1d9ed7c84 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |||
@@ -48,8 +48,7 @@ SYSTEMD_PACKAGES = "${PN}-base winbind" | |||
48 | SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" | 48 | SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" |
49 | SYSTEMD_SERVICE_winbind = "winbind.service" | 49 | SYSTEMD_SERVICE_winbind = "winbind.service" |
50 | 50 | ||
51 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 51 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ | ||
53 | acl cups ldap \ | 52 | acl cups ldap \ |
54 | " | 53 | " |
55 | 54 | ||
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb index 0040f677b..afae3c863 100644 --- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb +++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb | |||
@@ -19,5 +19,5 @@ SRC_URI[sha256sum] = "98f50244f7b43f8683bd0cf5c599849d330e75e6cf077e96f14e83bda8 | |||
19 | 19 | ||
20 | inherit autotools | 20 | inherit autotools |
21 | 21 | ||
22 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 22 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
23 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 23 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |