diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2020-05-13 18:51:49 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-27 00:33:17 +0300 |
| commit | 8f58bbac6ca801bf679e2a7a2a61b39adae8722d (patch) | |
| tree | 00d21952ba0ffd346d39e881fc2d5991a846e910 /meta-phosphor/conf | |
| parent | fd32a4f31911c9be070e266dd9b2f0a4f6777564 (diff) | |
| download | openbmc-8f58bbac6ca801bf679e2a7a2a61b39adae8722d.tar.xz | |
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>
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 31e669b65..8d53c8dda 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_OBMC = " \ 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} \ " |