Incorporate new phosphor-host-state-manager into appropriate image
Change-Id: I66f1414344ccc25e3db84c3de3a74993a99a9ff6
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index 9fc843f..a6c012a 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -6,6 +6,7 @@
obmc-host-ipmi \
obmc-host-ctl \
openpower-pflash \
+ obmc-host-state-mgmt \
"
VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index c8dc1e2..62b1c5f 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -12,6 +12,7 @@
# - obmc-phosphor-system-mgmt - Phosphor OpenBMC system management
# - obmc-host-ipmi - OpenBMC Host IPMI
# - obmc-logging - OpenBMC logging management
+# - obmc-host-state-mgmt - OpenBMC Host State Management
inherit core-image
inherit obmc-phosphor-license
@@ -28,6 +29,7 @@
FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}"
FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled('obmc-logging-mgmt', 'virtual-obmc-logging-mgmt', d)}"
FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled('obmc-host-ctl', 'virtual-obmc-host-ctl', d)}"
+FEATURE_PACKAGES_obmc-host-state-mgmt ?= "${@cf_enabled('obmc-host-state-mgmt', 'virtual-obmc-host-state-mgmt', d)}"
# Install entire Phosphor application stack by default
IMAGE_FEATURES += " \
@@ -43,6 +45,7 @@
obmc-logging-mgmt \
obmc-host-ctl \
ssh-server-dropbear \
+ obmc-host-state-mgmt \
"
CORE_IMAGE_EXTRA_INSTALL_append = " bash \
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index abd04b3..267e382 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-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 cc5edbd..bc0f955 100644
--- a/meta-phosphor/conf/distro/openbmc-phosphor.conf
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -34,6 +34,7 @@
obmc-host-ctl \
avahi \
slp \
+ obmc-host-state-mgmt \
${DISTRO_FEATURES_LIBC} \
"