summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-03-09 21:48:12 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-03-23 04:14:40 +0000
commitd3839348be84c133838f509c032b40dd51dfc110 (patch)
tree76e3a8a7bdc0b7ec5fb4722239739fdc62fbfdd3
parentab5979344b287784ecdac227bf86b95265530fa4 (diff)
downloadtalos-openbmc-d3839348be84c133838f509c032b40dd51dfc110.tar.gz
talos-openbmc-d3839348be84c133838f509c032b40dd51dfc110.zip
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>
-rw-r--r--meta-phosphor/conf/distro/include/phosphor-base.inc35
1 files changed, 25 insertions, 10 deletions
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 += " \
OpenPOWER on IntegriCloud