diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
commit | 901ced0812b458fdc599fe40b0a4233d422d6df9 (patch) | |
tree | b0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-phosphor/recipes-phosphor/state | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
parent | 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff) | |
download | openbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz |
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/state')
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc | 8 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 6 |
2 files changed, 13 insertions, 1 deletions
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 2e3b3b1cf..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 = "0a675215d6a6d2eb13e030ba0f618a4691de58d4" +SRCREV = "5f8e04a6e169121599b6e1e054900fffd1a42a39" S = "${WORKDIR}/git" |