diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2018-03-13 21:46:27 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 17:23:57 +0300 |
commit | 6bc2f026595b69c9594ce4843502a98129351143 (patch) | |
tree | 9a3364f618c88b080207a92a40362dbbc1430715 | |
parent | d7bf8c17eca8f8c89898a7794462c773c449e983 (diff) | |
download | openbmc-6bc2f026595b69c9594ce4843502a98129351143.tar.xz |
Make host-check a part of host state function
In the previous review it was noted that it didn't make much sense
for host-check to be it's own provided function in OpenBMC. It's more
of a recommended piece of the base host state function.
Change-Id: I024472e96ea00f411e8348e0221c210f84700019
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
4 files changed, 7 insertions, 18 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 95a915261..5570841ad 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -11,7 +11,6 @@ # - obmc-host-ctl - OpenBMC host control # - obmc-host-ipmi - OpenBMC host IPMI # - obmc-host-state-mgmt - OpenBMC host state management -# - obmc-host-check-mgmt - OpenBMC host state checking # - obmc-inventory - OpenBMC inventory support # - obmc-leds - OpenBMC LED support # - obmc-logging-mgmt - OpenBMC logging management @@ -39,7 +38,6 @@ FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-flash-mgmt' FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled(d, 'obmc-host-ctl', 'virtual-obmc-host-ctl')}" FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled(d, 'obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw')}" FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt" -FEATURE_PACKAGES_obmc-host-check-mgmt ?= "packagegroup-obmc-apps-host-check-mgmt" FEATURE_PACKAGES_obmc-inventory ?= "packagegroup-obmc-apps-inventory" FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds" FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'virtual-obmc-logging-mgmt')}" @@ -63,7 +61,6 @@ IMAGE_FEATURES += " \ obmc-host-ctl \ obmc-host-ipmi \ obmc-host-state-mgmt \ - obmc-host-check-mgmt \ obmc-inventory \ obmc-leds \ obmc-logging-mgmt \ diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index ee6e13cb0..41eb7a3f7 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -35,11 +35,6 @@ RDEPENDS_${PN}-chassis-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-chassis-state-manager} \ " -SUMMARY_${PN}-host-check-mgmt = "Host state check on bmc reset" -RDEPENDS_${PN}-host-check-mgmt = " \ - ${VIRTUAL-RUNTIME_obmc-host-check} \ - " - SUMMARY_${PN}-extras = "Extra features" RDEPENDS_${PN}-extras = " \ phosphor-rest \ diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb index 672090e15..67988f538 100644 --- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb @@ -25,10 +25,14 @@ DBUS_PACKAGES = "${STATE_MGR_PACKAGES}" SYSTEMD_PACKAGES = "${PN}-discover \ ${PN}-reset-sensor-states \ " + +# The host-check function will check if the host is running +# after a BMC reset. # The reset-sensor-states function will reset the host -# sensors on a BMC reset or system power loss so it is -# recommended when bringing in the host state function -RRECOMMENDS_${PN}-host = "${PN}-reset-sensor-states" +# sensors on a BMC reset or system power loss. +# Neither is required for host state function but are +# recommended to deal properly with these reset scenarios. +RRECOMMENDS_${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states" inherit autotools pkgconfig inherit obmc-phosphor-dbus-service diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 1cb2a35bb..047e88e7a 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -38,13 +38,6 @@ VIRTUAL-RUNTIME_obmc-host-state-manager ?= "phosphor-state-manager-host" # power the host back on. VIRTUAL-RUNTIME_obmc-discover-system-state ?= "phosphor-state-manager-discover" -# obmc-host-check -# -# Provides an implementation of phosphor-host-check, which will determine -# if the host is running after a BMC reboot and create the necessary file -# to indicate to host services that the host is running -VIRTUAL-RUNTIME_obmc-host-check ?= "phosphor-state-manager-host-check" - # obmc-fan-presence # # Provides implementations of fan presence detection |