From d3839348be84c133838f509c032b40dd51dfc110 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 9 Mar 2018 21:48:12 -0500
Subject: distro: Cleanup distro features

Consider (this is a Yocto verb) a number of backfilled features:
 pulseaudio
 bluez5
 ldconfig
 gobject-introspection-data

Put OpenBMC specific distro features in their own variable
DISTRO_FEATURES_OBMC.  This has no functional impact but does
make looking at DISTRO_FEATURES with bitbake -e a little easier
on the eyes.

Change-Id: I78a9e2f0807cac41bc119b04b42f32db5d1b9dbf
Tested: Build and verified witherspoon and palmetto images
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../conf/distro/include/phosphor-base.inc          | 35 +++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'meta-phosphor/conf')

diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 5e3583dd4..267aab6c1 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -11,26 +11,41 @@ IMAGE_LINGUAS = "en-us"
 VIRTUAL-RUNTIME_keymaps = ""
 
 # Phosphor OpenBMC uses systemd and udev
-DISTRO_FEATURES_append = " systemd pam"
 VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 VIRTUAL-RUNTIME_initscripts = ""
 
-DISTRO_FEATURES = "\
-        ipv6 \
-        obmc-phosphor-fan-mgmt \
+DISTRO_FEATURES_BACKFILL_CONSIDERED = " \
+        bluez5 \
+        ldconfig \
+        gobject-introspection-data \
+        pulseaudio \
+        sysvinit \
+        "
+
+DISTRO_FEATURES_OBMC = " \
+        obmc-host-ctl \
+        obmc-host-ipmi \
+        obmc-logging-mgmt \
+        obmc-net-ipmi \
         obmc-phosphor-chassis-mgmt \
+        obmc-phosphor-fan-mgmt \
         obmc-phosphor-flash-mgmt \
+        obmc-phosphor-system-mgmt \
         obmc-phosphor-user-mgmt \
         obmc-settings-mgmt \
-        obmc-phosphor-system-mgmt \
-        obmc-host-ipmi \
-        obmc-logging-mgmt \
-        obmc-host-ctl \
+        "
+
+DISTRO_FEATURES_DEFAULT = " \
         avahi \
+        pam \
         slp \
-        obmc-net-ipmi \
+        systemd \
+        "
+
+DISTRO_FEATURES = " \
+        ${DISTRO_FEATURES_DEFAULT} \
         ${DISTRO_FEATURES_LIBC} \
+        ${DISTRO_FEATURES_OBMC} \
         "
 
 MACHINE_FEATURES += " \
-- 
cgit v1.2.3