diff options
| author | Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com> | 2020-03-09 21:04:32 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-17 01:55:29 +0300 |
| commit | c8aa6a1dd361328fa529f7bab2fe53317a541329 (patch) | |
| tree | fecb51d996a11158788aab2a913353835c69e28b /meta-openpower | |
| parent | 37069179d17072e65f7a4ea06a66f29e7eea26ed (diff) | |
| download | openbmc-c8aa6a1dd361328fa529f7bab2fe53317a541329.tar.xz | |
Memory preserve reboot: recipe updates for mpreboot.
start_host@.service: Update to start_host service to skip it during
a memory preserve reboot
op-proc-control-systemd-links.bb: update to install services
op-proc-control_git.bb: Added mpreboot services
Bump openpower-proc-control SRCREV to required commit
(From meta-openpower rev: 7e0062d06c12e177f6a767a1c21066dc30ecae44)
Signed-off-by: Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com>
Change-Id: Ib2e3e34f3faa1ad575def9b26ff3e91d5eebf93f
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openpower')
3 files changed, 18 insertions, 1 deletions
diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service index 77a88e864..825275ae7 100644 --- a/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service +++ b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service @@ -8,6 +8,7 @@ Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on +ConditionPathExists=!/run/openbmc/mpreboot@%i [Service] ExecStart=/usr/bin/env openpower-proc-control startHost diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 8185ddf8f..46fdbbcb9 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -14,6 +14,8 @@ ALLOW_EMPTY_${PN} = "1" pkg_postinst_${PN}() { mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.wants mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires + mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires + mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service" TARGET="../op-stop-instructions@.service" @@ -30,6 +32,14 @@ pkg_postinst_${PN}() { TARGET="../cfam_override@.service" ln -s $TARGET $LINK fi + + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-continue-mpreboot@0.service" + TARGET="../op-continue-mpreboot@.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service" + TARGET="../op-enter-mpreboot@.service" + ln -s $TARGET $LINK } pkg_prerm_${PN}() { @@ -42,4 +52,8 @@ pkg_prerm_${PN}() { LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service" rm $LINK fi + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-continue-mpreboot@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service" + rm $LINK } diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 01ef6b043..1ede402e5 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "7847960506ca4357e267fe05866b38aad236708f" +SRCREV = "aefde6902507add3891557f2b9de5d407cfadb1e" DEPENDS += " \ autoconf-archive-native \ @@ -34,4 +34,6 @@ SYSTEMD_SERVICE_${PN} += " \ op-stop-instructions@.service \ op-cfam-reset.service \ ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ " |