From 6d7488dc7d017616953d65e65e0c6781928d9dcb Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Thu, 26 Aug 2021 16:24:20 -0500 Subject: meta-fii/meta-kudo: Revert host-check changes Kudo uses GPIO for checking the host status and does not use IPMI SMS. Therefore, this will remove the host-check feature as some of the recent recipe changes create stalls between host-state-manager and IPMI host control. Reference changes made in, https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-state-manager/+/45312 Signed-off-by: Charles Boyer Change-Id: I76b246dd003f94c95f194592647c4291014abf0b --- .../state/phosphor-state-manager_%.bbappend | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend') diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend index bbd60bb3fa..39106e8c1a 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -2,12 +2,38 @@ FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" CHASSIS_ACTION_TARGETS:append:kudo = " powercycle" +STATE_MGR_PACKAGES:remove:kudo = " ${PN}-host-check ${PN}-reset-sensor-states" +SYSTEMD_PACKAGES:remove:kudo = " ${PN}-reset-sensor-states" +RRECOMMENDS:${PN}-host:remove:kudo = " ${PN}-host-check ${PN}-reset-sensor-states" + +pkg_postinst:${PN}-obmc-targets:append:kudo() { + rm "$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/obmc-chassis-poweroff@0.target" + + rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" + rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/obmc-host-force-warm-reboot@0.target" + + rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service" + rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target" + + rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/obmc-host-stop@0.target" + rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/phosphor-reboot-host@0.service" + + rm "$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-running@0.service" + rm "$D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants/phosphor-reset-sensor-states@0.service" + rm "$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-reset-sensor-states@0.service" +} + SRC_URI:append:kudo = " \ file://xyz.openbmc_project.State.Chassis.service \ + file://xyz.openbmc_project.State.Host.service \ " do_install:append:kudo() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Chassis.service + install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Host.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Host.service + rm -f ${D}${systemd_system_unitdir}/phosphor-reset-host-check@.service + rm -f ${D}${systemd_system_unitdir}/phosphor-reset-sensor-states@.service + rm -f ${D}${systemd_system_unitdir}/phosphor-reset-host-running@.service } -- cgit v1.2.3