diff options
4 files changed, 6 insertions, 0 deletions
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 9fc843f3e..a6c012a69 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_MACHINE_FEATURES += "\ 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 c8dc1e2a9..62b1c5f7c 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-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 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 @@ IMAGE_FEATURES += " \ 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 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} \ " |