summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2019-05-06 10:15:44 +0200
committerArmin Kuster <akuster808@gmail.com>2019-05-23 07:03:43 -0700
commitd90727a25d4598eedabef38ff38088fd5d854177 (patch)
treea37a68cc1068289ca069b9f87662bb74b3b83882
parentf94b2a31547854c5ce11196ddde89d598a31736a (diff)
downloadmeta-openembedded-d90727a25d4598eedabef38ff38088fd5d854177.tar.gz
packagegroup-meta-networking: replace DISTRO_FEATURE by DISTRO_FEATURES
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index 63ad34cb8..64eabe462 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -38,8 +38,9 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\
38 inetutils wolfssl lftp miniupnpd networkmanager \ 38 inetutils wolfssl lftp miniupnpd networkmanager \
39 networkmanager-openvpn rdist nanomsg python-networkmanager \ 39 networkmanager-openvpn rdist nanomsg python-networkmanager \
40 wireless-regdb \ 40 wireless-regdb \
41 ${@bb.utils.contains("DISTRO_FEATURE", "bluez5 x11", "blueman", "", d)} \ 41 ${@bb.utils.contains("DISTRO_FEATURES", "bluez5 x11", "blueman", "", d)} \
42 ${@bb.utils.contains("DISTRO_FEATURE", "pam", "samba", "", d)} \ 42 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \
43 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \
43 " 44 "
44 45
45RDEPENDS_packagegroup-meta-networking-daemons = "\ 46RDEPENDS_packagegroup-meta-networking-daemons = "\
@@ -47,7 +48,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\
47 ptpd igmpproxy opensaf squid \ 48 ptpd igmpproxy opensaf squid \
48 atftp postfix iscsi-initiator-utils vsftpd cyrus-sasl \ 49 atftp postfix iscsi-initiator-utils vsftpd cyrus-sasl \
49 pure-ftpd vblade tftp-hpa ncftp \ 50 pure-ftpd vblade tftp-hpa ncftp \
50 ${@bb.utils.contains("DISTRO_FEATURE", "systemd", "networkd-dispatcher", "", d)} \ 51 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "networkd-dispatcher", "", d)} \
51 " 52 "
52 53
53RDEPENDS_packagegroup-meta-networking-devtools = "\ 54RDEPENDS_packagegroup-meta-networking-devtools = "\
@@ -56,7 +57,7 @@ RDEPENDS_packagegroup-meta-networking-devtools = "\
56 57
57RDEPENDS_packagegroup-meta-networking-extended = "\ 58RDEPENDS_packagegroup-meta-networking-extended = "\
58 corosync \ 59 corosync \
59 ${@bb.utils.contains("DISTRO_FEATURE", "systemd", "dlm", "", d)} \ 60 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dlm", "", d)} \
60 " 61 "
61 62
62RDEPENDS_packagegroup-meta-networking-filter = "\ 63RDEPENDS_packagegroup-meta-networking-filter = "\
@@ -85,7 +86,7 @@ RDEPENDS_packagegroup-meta-networking-protocols = "\
85 tsocks freediameter xl2tpd babeld mdns net-snmp \ 86 tsocks freediameter xl2tpd babeld mdns net-snmp \
86 quagga pptp-linux zeroconf nopoll openflow rp-pppoe \ 87 quagga pptp-linux zeroconf nopoll openflow rp-pppoe \
87 radiusclient-ng openl2tp usrsctp \ 88 radiusclient-ng openl2tp usrsctp \
88 ${@bb.utils.contains("DISTRO_FEATURE", "pam", "dante", "", d)} \ 89 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \
89 " 90 "
90 91
91RDEPENDS_packagegroup-meta-networking-support = "\ 92RDEPENDS_packagegroup-meta-networking-support = "\
@@ -104,7 +105,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\
104 netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ 105 netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \
105 arptables macchanger nghttp2 strongswan fping \ 106 arptables macchanger nghttp2 strongswan fping \
106 dnssec-conf libesmtp cifs-utils open-isns \ 107 dnssec-conf libesmtp cifs-utils open-isns \
107 ${@bb.utils.contains("DISTRO_FEATURE", "pam", "libldb", "", d)} \ 108 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "libldb", "", d)} \
108 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \ 109 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \
109 ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "spice", "", d)} \ 110 ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "spice", "", d)} \
110 " 111 "