phosphor-state-manager: srcrev bump 2bfb1efc4b..5f8e04a6e1
Andrew Geissler (6):
lg2: convert bmc state manager
bmc-reset: check host boot progress prior to reset
bmc-reset: create error if host was running
bmc-reset: ensure chassis power on target complete
bmc-reset: move to quiesce if host was running
bmc-reset: add service to launch new host recovery
Add new service to install image
Change-Id: I2b3aa0c8c80450295e7884ece74ad9729d3bd66e
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
index c692c61..6cee302 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
@@ -9,6 +9,11 @@
TARGET="../phosphor-discover-system-state@.service"
ln -s $TARGET $LINK
+ mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants
+ LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/phosphor-reset-host-recovery@0.service"
+ TARGET="../phosphor-reset-host-recovery@.service"
+ ln -s $TARGET $LINK
+
mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires
LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/obmc-host-startmin@0.target"
TARGET="../obmc-host-startmin@.target"
@@ -89,6 +94,9 @@
LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-discover-system-state@0.service"
rm $LINK
+ LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/phosphor-reset-host-recovery@0.service"
+ rm $LINK
+
LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/obmc-host-startmin@0.target"
rm $LINK
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index befda3f..434e635 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -83,6 +83,9 @@
FILES:${PN}-host-check = "${bindir}/phosphor-host-check"
SYSTEMD_SERVICE:${PN}-host-check += "phosphor-reset-host-running@.service"
+FILES:${PN}-host-check = "${bindir}/phosphor-host-reset-recovery"
+SYSTEMD_SERVICE:${PN}-host-check += "phosphor-reset-host-recovery@.service"
+
SYSTEMD_SERVICE:${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service"
@@ -181,7 +184,8 @@
SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}"
SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}"
+
SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "2bfb1efc4bc7e781224e19c05b51e6675f13a488"
+SRCREV = "5f8e04a6e169121599b6e1e054900fffd1a42a39"
S = "${WORKDIR}/git"