diff options
| author | Andrew Geissler <openbmcbump-github@yahoo.com> | 2020-11-04 19:41:45 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-11-05 04:20:57 +0300 |
| commit | b05ebce1fce70362003af2d9591982a88cf530d0 (patch) | |
| tree | 61e363c48ca3bff3229996b170d3572202b290f0 /meta-phosphor/recipes-phosphor/state | |
| parent | dbf12f62da9f76a97861a9912e21c1cec087e725 (diff) | |
| download | openbmc-b05ebce1fce70362003af2d9591982a88cf530d0.tar.xz | |
phosphor-state-manager: srcrev bump 162c7bfb0c..3191be88af
Andrew Geissler (5):
soft-off: ensure pldm soft svc stopped on hard poweroff
autoreboot: clear one time properties on chassis off
autoreboot: one-time object support
autoreboot: add one-time property to logic
autoreboot: add one-time support to obmcutil
Install new phosphor-clear-one-time@.service into
obmc-chassis-poweroff@.target
(From meta-phosphor rev: 948e50a15fd86fb84b9697019cf3ae099fa114fb)
Change-Id: I3e883d65ceb403aea09e21dfe1a95bea5f5bffdb
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
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 | 3 |
2 files changed, 10 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 1ec65d29f..6c12da8c4 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 @@ -77,6 +77,11 @@ pkg_postinst_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target" TARGET="../obmc-host-force-warm-reboot@.target" ln -s $TARGET $LINK + + mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" + TARGET="../phosphor-clear-one-time@.service" + ln -s $TARGET $LINK } pkg_prerm_${PN}-obmc-targets_append() { @@ -131,4 +136,7 @@ pkg_prerm_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target" rm $LINK + + LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" + 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 5d2357ef5..4c9978b77 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -58,6 +58,7 @@ FILES_${PN}-host = "${bindir}/phosphor-host-state-manager" DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service" +SYSTEMD_SERVICE_${PN}-host += "phosphor-clear-one-time@.service" FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager" DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" @@ -173,6 +174,6 @@ SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA 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 = "162c7bfb0cbedcc5ccaf74c773da5a7c81fef8b1" +SRCREV = "3191be88af4df13e19ec6c37679e92e0ed4e6080" S = "${WORKDIR}/git" |