| commit | d2b95c714b4b4aee453c860032815bcd345774e5 | [log] [tgz] |
|---|---|---|
| author | Josh King <jdking@us.ibm.com> | Thu Jan 19 14:04:03 2017 -0600 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Fri Jan 27 02:37:52 2017 +0000 |
| tree | 97dc7a25af974121c04cfea4a51459648f5a293d | |
| parent | 55f7f1810cfe8d63b92d3aa499469b772b30659b [diff] |
Incorporate new phosphor-bmc-state-manager into appropriate image Change-Id: I4c013d98e03703b1328d85ae00cebb8500ffa205 Signed-off-by: Josh King <jdking@us.ibm.com>
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index f5263bb..5bada92 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -21,6 +21,7 @@ PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging" PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager" PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager" +PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager" # virtual/phosphor-ipmi-fru-config #
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 06df823..b177b9e 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -36,6 +36,7 @@ avahi \ obmc-host-state-mgmt \ obmc-chassis-state-mgmt \ + obmc-bmc-state-mgmt \ ${DISTRO_FEATURES_LIBC} \ "