commit 8f58bbac6ca801bf679e2a7a2a61b39adae8722d
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 10:51:49 2020 -0500
committer Andrew Geissler <geissonator@yahoo.com> Tue May 26 16:33:17 2020 -0500
tree 00d21952ba0ffd346d39e881fc2d5991a846e910
parent fd32a4f31911c9be070e266dd9b2f0a4f6777564

meta-phosphor: add ipv4/ipv6 DISTRO_FEATURES

DISTRO_FEATURES_LIBC was removed from upstream poky in 2.7 (see
ref-manual/migration.xml), and we use to get ipv4 and ipv6 picked
up as DISTRO_FEATURES as a side-effect of this variable.  It was
reported that ipv6 tools were missing from the image, so add this
back directly as a DISTRO_FEATURE.

Also, sort DISTRO_FEATURES_DEFAULT and remove any reference to the
now-deprecated DISTRO_FEATURES_LIBC.

(From meta-phosphor rev: 4877428408c6b2937c6e75d1cdb32f12ad975acf)

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ic0d75deccf57147734849c3800b8b316a60971d0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

meta-phosphor/conf/distro/include/phosphor-base.inc

diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 31e669b..8d53c8d 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -104,16 +104,17 @@
 
 DISTRO_FEATURES_DEFAULT = " \
         avahi \
+        ipv4 \
+        ipv6 \
+        ldap \
+        libc-inet-anl \
         pam \
         slp \
         systemd \
-        ldap \
-        libc-inet-anl \
         "
 
 DISTRO_FEATURES += " \
         ${DISTRO_FEATURES_DEFAULT} \
-        ${DISTRO_FEATURES_LIBC} \
         ${DISTRO_FEATURES_OBMC} \
         "