[oe] [warrior][patch 21/34] packagegroup-meta-networking: replace DISTRO_FEATURE by DISTRO_FEATURES
Martin Jansa
martin.jansa at gmail.com
Tue May 21 09:55:04 UTC 2019
On Tue, May 21, 2019 at 12:41:32PM +0300, Adrian Bunk wrote:
> On Mon, May 20, 2019 at 08:56:21PM -0700, Armin Kuster wrote:
> >...
> > --- 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)} \
> > "
> >...
>
> This adds packages to packagegroups in a stable series.
>
> I'd say removing the broken DISTRO_FEATURE lines would be better
> than changing what gets installed to images in warrior.
You're right, but in this case I believe that packagegroup-meta-networking
is only used for some CI builds and nobody includes it in images for
some products. Fixing the DISTRO_FEATURE/DISTRO_FEATURES typo to include
all packages in CI builds would be useful for stable branch as well.
I don't count meta-networking-image added together with
packagegroup-meta-networking as image people use for some products.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20190521/d33ffc2f/attachment.sig>
More information about the Openembedded-devel
mailing list