diff options
author | Andrew Geissler <openbmcbump-github@yahoo.com> | 2022-02-22 02:00:20 +0300 |
---|---|---|
committer | Andrew Geissler <andrew@geissonator.com> | 2022-02-22 23:14:01 +0300 |
commit | a02a18a99f051c52e2893d49ccd8399a79bdaef5 (patch) | |
tree | b414224a0f4a5ab60c2bc8b3cc49657b5cfd384b /meta-phosphor | |
parent | eaf259f3534823058553a10f2f0c88c65fb11d15 (diff) | |
download | openbmc-a02a18a99f051c52e2893d49ccd8399a79bdaef5.tar.xz |
phosphor-state-manager: srcrev bump 1fc48456ac..d93da77590
Andrew Geissler (11):
pinhole: move gpio function to utils
pinhole: check for bmc reset reason
pinhole: utility interface to create errors
pinhole: generate log when pinhole reset occurs
pinhole: do not log power loss error on pinhole
pinhole: move power policy service to utils
pinhole: no power restore policy on pinhole reset
ups: check state on startup and update power status
ups: watch for property changes
ups: do not power on if power status is bad
add namespace on setProperty
Includes support for new chassis-check-power-status package.
Change-Id: I5f8e95027dd324038f84e1f567f19aecc43e3d22
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc | 14 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 6 |
2 files changed, 19 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 6cee30287b..c93503ee5b 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 @@ -86,6 +86,14 @@ pkg_postinst:${PN}-obmc-targets:append() { ln -s $TARGET $LINK } +pkg_postinst:${PN}-chassis-check-power-status:append() { + + mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/phosphor-chassis-check-power-status@0.service" + TARGET="../phosphor-chassis-check-power-status@.service" + ln -s $TARGET $LINK +} + pkg_prerm:${PN}-obmc-targets:append() { LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@0.target" @@ -142,3 +150,9 @@ pkg_prerm:${PN}-obmc-targets:append() { LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" rm $LINK } + +pkg_prerm:${PN}-chassis-check-power-status:append() { + + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/phosphor-chassis-check-power-status@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 46ea1120d4..022420ee9a 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -21,6 +21,7 @@ STATE_MGR_PACKAGES = " \ ${PN}-systemd-target-monitor \ ${PN}-obmc-targets \ ${PN}-scheduled-host-transition \ + ${PN}-chassis-check-power-status \ " PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}" ALLOW_EMPTY:${PN} = "1" @@ -99,6 +100,9 @@ SYSTEMD_SERVICE:${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor FILES:${PN}-scheduled-host-transition = "${bindir}/phosphor-scheduled-host-transition" DBUS_SERVICE:${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition.service" +FILES:${PN}-chassis-check-power-status = "${bindir}/phosphor-chassis-check-power-status" +SYSTEMD_SERVICE:${PN}-chassis-check-power-status += "phosphor-chassis-check-power-status@.service" + # Chassis power synchronization targets # - start-pre: Services to run before we start power on process # - start: Services to run to do the chassis power on @@ -187,6 +191,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERRO SRC_URI += "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https" -SRCREV = "1fc48456ac9d156e5a6bbc5c65c89b6e3987d17f" +SRCREV = "d93da7759068c558e93d94c36d7767fdf12f9928" S = "${WORKDIR}/git" |