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>
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 95a9152..5570841 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-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 @@
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 ee6e13c..41eb7a3 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 @@
${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 672090e..67988f5 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 @@
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 1cb2a35..047e88e 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -38,13 +38,6 @@
# 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