diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-01-06 01:51:58 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2021-01-12 16:52:54 +0300 |
commit | 4ef0e115d06fd598c4cd937f771cba74fed3be97 (patch) | |
tree | 0659f2b779388b9a21e7c146a1546fe93314a98d | |
parent | 72956edabebd4188f98e3b0d9f8ce727e8d13ea3 (diff) | |
download | openbmc-4ef0e115d06fd598c4cd937f771cba74fed3be97.tar.xz |
install host state transition services
See the following for more details:
https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-state-manager/+/39359
This will install the services required to get the TransitionToRunning
and TransitionToOff support for CurrentHostState.
Includes following in bump:
Andrew Geissler (1):
host state transitioning support
Tested:
- Verified CurrentHostState changed as expected doing a host on, off,
and reboot.
(From meta-phosphor rev: 56b7928ea464b89f1f585a92549d9026d1b91a43)
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iffd6a7b9a71a0df0ee1180797db4253051436edf
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc | 16 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 4 |
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 6c12da8c4..10e255d58 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 @@ -18,6 +18,16 @@ pkg_postinst_${PN}-obmc-targets_append() { TARGET="../phosphor-reset-host-reboot-attempts@.service" ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/phosphor-set-host-transition-to-running@0.service" + TARGET="../phosphor-set-host-transition-to-running@.service" + ln -s $TARGET $LINK + + mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-set-host-transition-to-off@0.service" + TARGET="../phosphor-set-host-transition-to-off@.service" + ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-reset@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-check@0.service" TARGET="../phosphor-reset-host-check@.service" @@ -98,6 +108,12 @@ pkg_prerm_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phosphor-reset-host-reboot-attempts@0.service" rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/phosphor-set-host-transition-to-running@0.service" + rm $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-set-host-transition-to-off@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-check@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 8e74e69a0..4a1854e72 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -59,6 +59,8 @@ 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" +SYSTEMD_SERVICE_${PN}-host += "phosphor-set-host-transition-to-running@.service" +SYSTEMD_SERVICE_${PN}-host += "phosphor-set-host-transition-to-off@.service" FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager" DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" @@ -174,6 +176,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 = "bbbc01655243fecc83f8734f12a57e665b90ff9a" +SRCREV = "1e8b164f7b575f9728dd7f46d7b2d27e6081ee3f" S = "${WORKDIR}/git" |