summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Geissler <openbmcbump-github@yahoo.com>2022-02-25 22:30:14 +0300
committerAndrew Geissler <andrew@geissonator.com>2022-02-26 00:27:13 +0300
commit77c0126ab830535b1c8a98521a2eab5f38cb8353 (patch)
tree4bd51f001c0e9fcfe217d7f69f3a7255f8e8533f
parent9cf6445938e1bc6d1a2f72710c9c4a36d8a2beb6 (diff)
downloadopenbmc-77c0126ab830535b1c8a98521a2eab5f38cb8353.tar.xz
phosphor-state-manager: srcrev bump d93da77590..15cee5bd43
Andrew Geissler (8): crit-service: initial service and parsing crit-service: create error on failed service crit-service: add failed unit to error log crit-service: create bmc dump on failure crit-service: start bmc quiesce target on fail crit-service: refactor unit state checking crit-service: check for bmc quiesce on startup crit-service: enable monitoring of critical services Thang Tran (1): check requested state before update properties Includes adding new default critical services json and bmc quiesce target. Change-Id: I96f2e8b327cdeec0c0a4bf3c8c69615a75544f49 Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
-rw-r--r--meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc4
-rw-r--r--meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb4
2 files changed, 7 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 c93503ee5b..71f7d8e34f 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,10 @@ pkg_postinst:${PN}-obmc-targets:append() {
TARGET="../phosphor-discover-system-state@.service"
ln -s $TARGET $LINK
+ LINK="$D$systemd_system_unitdir/obmc-bmc-service-quiesce@0.target"
+ TARGET="./obmc-bmc-service-quiesce@.target"
+ 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"
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 022420ee9a..ed103c1f98 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -75,7 +75,9 @@ DBUS_SERVICE:${PN}-chassis += "xyz.openbmc_project.State.Chassis.service"
FILES:${PN}-chassis += "${bindir}/obmcutil"
FILES:${PN}-bmc = "${bindir}/phosphor-bmc-state-manager"
+FILES:${PN}-bmc += "${sysconfdir}/phosphor-systemd-target-monitor/phosphor-service-monitor-default.json"
DBUS_SERVICE:${PN}-bmc += "xyz.openbmc_project.State.BMC.service"
+DBUS_SERVICE:${PN}-bmc += "obmc-bmc-service-quiesce@.target"
FILES:${PN}-hypervisor = "${bindir}/phosphor-hypervisor-state-manager"
DBUS_SERVICE:${PN}-hypervisor += "xyz.openbmc_project.State.Hypervisor.service"
@@ -191,6 +193,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 = "d93da7759068c558e93d94c36d7767fdf12f9928"
+SRCREV = "15cee5bd43a011f3d8c970dafaac86a8d70e503f"
S = "${WORKDIR}/git"