aboutsummaryrefslogtreecommitdiffstats
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-18 07:29:37 -0700
commitb1fdd51d97dca34a7221649831fc3e0d832219b5 (patch)
treef76ec49fd84f7111ba71d29dcc159a484f041d93
parent5a2e43b22c72124f4b222e50abbd2d7f69ab77e2 (diff)
downloadmeta-openembedded-contrib-b1fdd51d97dca34a7221649831fc3e0d832219b5.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 63ad34cb83..64eabe4629 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 = "\
inetutils wolfssl lftp miniupnpd networkmanager \
networkmanager-openvpn rdist nanomsg python-networkmanager \
wireless-regdb \
- ${@bb.utils.contains("DISTRO_FEATURE", "bluez5 x11", "blueman", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURE", "pam", "samba", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "bluez5 x11", "blueman", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \
"
RDEPENDS_packagegroup-meta-networking-daemons = "\
@@ -47,7 +48,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\
ptpd igmpproxy opensaf squid \
atftp postfix iscsi-initiator-utils vsftpd cyrus-sasl \
pure-ftpd vblade tftp-hpa ncftp \
- ${@bb.utils.contains("DISTRO_FEATURE", "systemd", "networkd-dispatcher", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "networkd-dispatcher", "", d)} \
"
RDEPENDS_packagegroup-meta-networking-devtools = "\
@@ -56,7 +57,7 @@ RDEPENDS_packagegroup-meta-networking-devtools = "\
RDEPENDS_packagegroup-meta-networking-extended = "\
corosync \
- ${@bb.utils.contains("DISTRO_FEATURE", "systemd", "dlm", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dlm", "", d)} \
"
RDEPENDS_packagegroup-meta-networking-filter = "\
@@ -85,7 +86,7 @@ RDEPENDS_packagegroup-meta-networking-protocols = "\
tsocks freediameter xl2tpd babeld mdns net-snmp \
quagga pptp-linux zeroconf nopoll openflow rp-pppoe \
radiusclient-ng openl2tp usrsctp \
- ${@bb.utils.contains("DISTRO_FEATURE", "pam", "dante", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \
"
RDEPENDS_packagegroup-meta-networking-support = "\
@@ -104,7 +105,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\
netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \
arptables macchanger nghttp2 strongswan fping \
dnssec-conf libesmtp cifs-utils open-isns \
- ${@bb.utils.contains("DISTRO_FEATURE", "pam", "libldb", "", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "libldb", "", d)} \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \
${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "spice", "", d)} \
"