diff options
author | Andrew Geissler <openbmcbump-github@yahoo.com> | 2022-03-25 19:10:13 +0300 |
---|---|---|
committer | Andrew Geissler <andrew@geissonator.com> | 2022-04-08 21:39:14 +0300 |
commit | e1900161124ebd6c7ff8d21ab977e5d506afb846 (patch) | |
tree | d4405c271c841edb1d93a515fc17b5cc85e6cdb0 | |
parent | de0582f0e7de86eaf8c8d90d86ed313273a73774 (diff) | |
download | openbmc-e1900161124ebd6c7ff8d21ab977e5d506afb846.tar.xz |
phosphor-state-manager: bump and multi host/chassis support
phosphor-state-manager: srcrev bump 1ab2b6cea6..211d972d75
Adriana Kobylak (1):
chassis: Monitor the PowerSystemInputs for power status
Allen.Wang (2):
host-state-manager: Add multi-host support
chassis-state-manager: Correct poweroff state Unit
Andrew Geissler (2):
ensure bmc-state-manager stays in quiesce state
generate bmc dump on monitored systemd target fail
Brandon Wyman (1):
Correct pinhole reset logic for chassis state
Mike Capps (1):
Set Critical severity for Blackout errors
Patrick Williams (7):
filesystem: use non-experimental version
meson: remove stdc++fs dependency
meson: add subproject wraps for current dependencies
sdbusplus: object: don't use 'bool' argument constructor
meson: add missing dependencies and wraps
crit-service: update defaults for templated Host/Chassis
sched-host-tran: support multi-host
Potin Lai (3):
chassis-state-manager: Add multi-chassis support
discover-system-state: add multi-host support
host-state-manager: fix host0 failure with reading wrong object path
shamim ali (1):
power-on-hours: ensure not incremented when system off
Some commits went into phosphor-state-manager support that starts the
framework to support multiple chassis and hosts within a system. This
commit templates both the host and chassis services.
Change-Id: I19764aa0c625d4d28d8d0e672658f1a3910335af
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
4 files changed, 22 insertions, 8 deletions
diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json b/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json index d2c9be6bf1..b32da0760b 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json +++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json @@ -14,8 +14,8 @@ "xyz.openbmc_project.Software.Download.service", "xyz.openbmc_project.Software.Version.service", "xyz.openbmc_project.State.BMC.service", - "xyz.openbmc_project.State.Chassis.service", - "xyz.openbmc_project.State.Host.service", + "xyz.openbmc_project.State.Chassis@0.service", + "xyz.openbmc_project.State.Host@0.service", "xyz.openbmc_project.Time.Manager.service", "xyz.openbmc_project.User.Manager.service", "bmcweb.service", 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 86415a4a88..3a4898b86e 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 @@ -8,6 +8,14 @@ pkg_postinst:${PN}-obmc-targets:append() { for i in ${OBMC_HOST_INSTANCES}; do mkdir -p $D$systemd_system_unitdir/multi-user.target.requires + LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Host@${i}.service" + TARGET="../xyz.openbmc_project.State.Host@.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Chassis@${i}.service" + TARGET="../xyz.openbmc_project.State.Chassis@.service" + ln -s $TARGET $LINK + LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@${i}.target" TARGET="../obmc-host-reset@.target" ln -s $TARGET $LINK @@ -114,6 +122,12 @@ pkg_prerm:${PN}-obmc-targets:append() { for i in ${OBMC_HOST_INSTANCES}; do + LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Host@${i}.service" + rm $LINK + + LINK="$D$systemd_system_unitdir/multi-user.target.requires/xyz.openbmc_project.State.Chassis@${i}.service" + rm $LINK + LINK="$D$systemd_system_unitdir/multi-user.target.requires/obmc-host-reset@${i}.target" 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 4a16e5bb9f..89a0e6e1c6 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -62,7 +62,7 @@ RDEPENDS:${PN}-chassis += "bash" EXTRA_OEMESON:append = " -Dtests=disabled" FILES:${PN}-host = "${bindir}/phosphor-host-state-manager" -DBUS_SERVICE:${PN}-host += "xyz.openbmc_project.State.Host.service" +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" @@ -70,7 +70,7 @@ 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" +DBUS_SERVICE:${PN}-chassis += "xyz.openbmc_project.State.Chassis@.service" FILES:${PN}-chassis += "${bindir}/obmcutil" @@ -100,7 +100,7 @@ FILES:${PN}-systemd-target-monitor = " \ SYSTEMD_SERVICE:${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor.service" FILES:${PN}-scheduled-host-transition = "${bindir}/phosphor-scheduled-host-transition" -DBUS_SERVICE:${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition.service" +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" @@ -193,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 = "1ab2b6cea615419da0cb3e1900297ab694dc45ae" +SRCREV = "211d972d7511c7e6aada8053d52d7cb198a75969" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service index 9fcca01ed4..0749f128a4 100644 --- a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service +++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service @@ -1,8 +1,8 @@ [Unit] Description=UART render controller -Requires=xyz.openbmc_project.State.Host.service -After=xyz.openbmc_project.State.Host.service +Requires=xyz.openbmc_project.State.Host@0.service +After=xyz.openbmc_project.State.Host@0.service [Service] ExecStart=/usr/sbin/obmc-uart-render-controller \ |