commit 8c5455698b30a9110add0f601338f2b6e6bcbefe
author Andrew Geissler <andrewg@us.ibm.com> Tue Jan 17 15:19:16 2017 -0600
committer Patrick Williams <patrick@stwcx.xyz> Wed Jan 18 21:39:58 2017 +0000
tree 50c3a9cb49685e90319a2778ee9a3b31508252e5
parent c633d230be33afbeae86ed1cd71755f7188a1085

Incorporate new phosphor-chassis-state-manager in appropriate image

Change-Id: I39ca1fdfb7f549036b8eb27d7cfe9cd7309dcc54
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>

conf/distro/include/phosphor-defaults.inc

diff --git a/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index 267e382..aae0cdb 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -20,3 +20,4 @@
 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"
+PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-chassis-state-manager"

conf/distro/openbmc-phosphor.conf

diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index bc0f955..2d8f6a3 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -35,6 +35,7 @@
         avahi \
         slp \
         obmc-host-state-mgmt \
+        obmc-chassis-state-mgmt \
         ${DISTRO_FEATURES_LIBC} \
         "