Refactor action target names Power-on-off
The target change is:
obmc-power-chassis-on -> obmc-chassis-poweron
obmc-power-chassis-off -> obmc-chassis-poweroff
Also updated phosphor-state-manager.bb to now
have correct commit id.
Change-Id: I15aae803e5f0d44d4e6a137278f93e91f848b2c0
Signed-off-by: Josh D. King <jdking@us.ibm.com>
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 6217e14..44421bd 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
@@ -25,12 +25,12 @@
SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control"
START_TMPL = "op-power-start@.service"
-START_TGTFMT = "obmc-power-chassis-on@{1}.target"
+START_TGTFMT = "obmc-chassis-poweron@{1}.target"
START_INSTFMT = "op-power-start@{0}.service"
START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
STOP_TMPL = "op-power-stop@.service"
-STOP_TGTFMT = "obmc-power-chassis-off@{1}.target"
+STOP_TGTFMT = "obmc-chassis-poweroff@{1}.target"
STOP_INSTFMT = "op-power-stop@{0}.service"
STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}"
@@ -65,15 +65,15 @@
SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
# Now show that the main control target requires these power targets
-START_TMPL_CTRL = "obmc-power-chassis-on@.target"
+START_TMPL_CTRL = "obmc-chassis-poweron@.target"
START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target"
-START_INSTFMT_CTRL = "obmc-power-chassis-on@{0}.target"
+START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target"
START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}"
SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-STOP_TMPL_CTRL = "obmc-power-chassis-off@.target"
+STOP_TMPL_CTRL = "obmc-chassis-poweroff@.target"
STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target"
-STOP_INSTFMT_CTRL = "obmc-power-chassis-off@{0}.target"
+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')}"