diff options
author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-fii/meta-kudo/recipes-phosphor | |
parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'meta-fii/meta-kudo/recipes-phosphor')
4 files changed, 73 insertions, 6 deletions
diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json index 2dccd42e8..47cb2cc60 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -6,7 +6,6 @@ "power_up_outs": [ ], "reset_outs": [ - {"name": "BMC_S0_SYSRESET_N", "polarity": false} ] } }, @@ -16,11 +15,6 @@ "name": "PGOOD", "num": 200, "direction": "in" - }, - { - "name": "BMC_S0_SYSRESET_N", - "num": 65, - "direction": "out" } ] } diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis.service b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis.service new file mode 100644 index 000000000..d8df56164 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis.service @@ -0,0 +1,18 @@ +[Unit] +Description=Phosphor Chassis State Manager +Before=mapper-wait@-xyz-openbmc_project-state-chassis.service +Wants=obmc-mapper.target +After=obmc-mapper.target +After=org.openbmc.control.Power@0.service +After=host-powerctrl.service + +[Service] +ExecStartPre=/bin/sleep 5 +ExecStart=/usr/bin/phosphor-chassis-state-manager +Restart=always +Type=dbus +BusName=xyz.openbmc_project.State.Chassis + +[Install] +WantedBy=multi-user.target + diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host.service b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host.service new file mode 100644 index 000000000..3455aeea2 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host.service @@ -0,0 +1,16 @@ +[Unit] +Description=Phosphor Host State Manager +Wants=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service +After=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service +Before=mapper-wait@-xyz-openbmc_project-state-host.service +Wants=obmc-mapper.target +After=obmc-mapper.target + +[Service] +ExecStart=/usr/bin/phosphor-host-state-manager +Restart=always +Type=dbus +BusName=xyz.openbmc_project.State.Host + +[Install] +WantedBy=multi-user.target 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 new file mode 100644 index 000000000..39106e8c1 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -0,0 +1,39 @@ +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 +} + |