From ef50c6af5d004b43308f350310e02c138fa9f533 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Sep 2021 18:01:30 +0000 Subject: 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 --- .../state/phosphor-state-manager-systemd-links.inc | 8 ++++++++ .../recipes-phosphor/state/phosphor-state-manager_git.bb | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 c692c6163..6cee30287 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 @@ pkg_postinst:${PN}-obmc-targets:append() { 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 @@ pkg_prerm:${PN}-obmc-targets:append() { 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 befda3ff3..434e63550 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 @@ SYSTEMD_SERVICE:${PN}-discover += "phosphor-discover-system-state@.service" 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, 'HOST_LINK_ACTION_FMT', ' 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" -- cgit v1.2.3