diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-05-06 10:15:44 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-06 08:32:04 -0700 |
commit | 183b99913bff53c45450e7f00331b0dfea21f506 (patch) | |
tree | 01b04b1fe65ac54cc4df8249199e776719046670 | |
parent | 97974627609958b6cc2b9ea19026bcf2a34a671f (diff) | |
download | meta-openembedded-183b99913bff53c45450e7f00331b0dfea21f506.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>
-rw-r--r-- | meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb | 13 |
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 | ||
45 | RDEPENDS_packagegroup-meta-networking-daemons = "\ | 46 | RDEPENDS_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 | ||
53 | RDEPENDS_packagegroup-meta-networking-devtools = "\ | 54 | RDEPENDS_packagegroup-meta-networking-devtools = "\ |
@@ -56,7 +57,7 @@ RDEPENDS_packagegroup-meta-networking-devtools = "\ | |||
56 | 57 | ||
57 | RDEPENDS_packagegroup-meta-networking-extended = "\ | 58 | RDEPENDS_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 | ||
62 | RDEPENDS_packagegroup-meta-networking-filter = "\ | 63 | RDEPENDS_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 | ||
91 | RDEPENDS_packagegroup-meta-networking-support = "\ | 92 | RDEPENDS_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 | " |