summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/conf
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-01-10 15:36:11 -0600
committerPatrick Williams <patrick@stwcx.xyz>2017-01-18 21:39:51 +0000
commit5256e0ec55cc4f6386f0cc3858d127173c238765 (patch)
tree73b9985a8f30dc98b5803f0a7aad836e1be1ce01 /meta-phosphor/conf
parentd8f5cc2fd22d40460402de3e634421a4bf41ede7 (diff)
downloadtalos-openbmc-5256e0ec55cc4f6386f0cc3858d127173c238765.tar.gz
talos-openbmc-5256e0ec55cc4f6386f0cc3858d127173c238765.zip
Incorporate new phosphor-host-state-manager into appropriate image
Change-Id: I66f1414344ccc25e3db84c3de3a74993a99a9ff6 Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/conf')
-rw-r--r--meta-phosphor/conf/distro/include/phosphor-defaults.inc1
-rw-r--r--meta-phosphor/conf/distro/openbmc-phosphor.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index abd04b327..267e38279 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -19,3 +19,4 @@ PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
+PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-host-state-manager"
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf
index cc5edbdbe..bc0f955f4 100644
--- a/meta-phosphor/conf/distro/openbmc-phosphor.conf
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -34,6 +34,7 @@ DISTRO_FEATURES = "\
obmc-host-ctl \
avahi \
slp \
+ obmc-host-state-mgmt \
${DISTRO_FEATURES_LIBC} \
"
OpenPOWER on IntegriCloud