From 2a6a438b710127d18796c0da652a2ee0a413aab4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 May 2017 12:34:21 -0500 Subject: Revert "Ensure host-stop target called on chassis-poweroff" This reverts commit d75d9c516913bee640e3b4c245e8bd40e0965002. Resolves openbmc/openbmc#1645 Change-Id: Ib73cda8fc970f51e5f4fd6db4cf62b5cc05ae67b Signed-off-by: Andrew Geissler --- .../common/recipes-phosphor/chassis/obmc-op-control-power.bb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'meta-phosphor/common/recipes-phosphor/chassis') diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index 8935ef0b4..19efac655 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb @@ -77,14 +77,6 @@ STOP_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -# Ensure when the obmc-chassis-poweroff target is called that -# obmc-host-stop target is also called -OFF_TMPL_CTRL = "obmc-host-stop@.target" -OFF_TGTFMT_CTRL = "obmc-chassis-poweroff@{1}.target" -OFF_INSTFMT_CTRL = "obmc-host-stop@{0}.target" -OFF_FMT_CTRL = "../${OFF_TMPL_CTRL}:${OFF_TGTFMT_CTRL}.requires/${OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT_CTRL', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" - # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -- cgit v1.2.1