diff options
author | Josh D. King <jdking@us.ibm.com> | 2017-04-06 22:43:46 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-04-20 18:43:44 +0300 |
commit | b9ee536d0aae31718054ddad187a93d761d9dea2 (patch) | |
tree | 95bd59def58214239025ac679138dfb9f82fc22c /meta-phosphor/common/recipes-phosphor/chassis | |
parent | 360a31bed22a78cf09ed2df7f54dac7a700beacd (diff) | |
download | openbmc-b9ee536d0aae31718054ddad187a93d761d9dea2.tar.xz |
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>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/chassis')
8 files changed, 13 insertions, 13 deletions
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 6217e141bf..44421bd92f 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_SERVICE_${PN} += " \ 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_FMT', 'OBMC_POWER_INSTAN 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')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service index 08131230c5..f76695e7b1 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service @@ -6,7 +6,7 @@ After=obmc-power-start-pre@%i.target After=obmc-fan-control.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-power-chassis-off@%i.target +Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service index 9120a87bdf..86ddf4a320 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service @@ -5,7 +5,7 @@ Before=obmc-power-stop@%i.target After=obmc-power-stop-pre@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-power-chassis-on@%i.target +Conflicts=obmc-chassis-poweron@%i.target [Service] RemainAfterExit=yes diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service index e41950d291..cb78804e0c 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service @@ -7,7 +7,7 @@ Requires=obmc-power-reset-on@%i.target [Service] RemainAfterExit=no -ExecStart=/bin/systemctl start obmc-power-chassis-on@%i.target +ExecStart=/bin/systemctl start obmc-chassis-poweron@%i.target [Install] diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service index b0095371f7..2a461513d8 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service @@ -4,7 +4,7 @@ Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service Wants=obmc-power-reset-on@%i.target Before=obmc-power-reset-on@%i.target -Conflicts=obmc-power-chassis-off@%i.target +Conflicts=obmc-chassis-poweroff@%i.target [Service] RemainAfterExit=no diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service index 4d58d61a0e..da852ff3fd 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service @@ -4,7 +4,7 @@ After=obmc-power-reset-on@%i.target Requires=obmc-power-reset-on@%i.target After=op-reset-pgood-check@%i.service Requires=op-reset-pgood-check@%i.service -Conflicts=obmc-power-chassis-off@%i.target +Conflicts=obmc-chassis-poweroff@%i.target [Service] RemainAfterExit=no diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service index 46e413eef6..32ae6942d2 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service @@ -5,7 +5,7 @@ Wants=obmc-power-stop@%i.target Before=obmc-power-stop@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-power-chassis-on@%i.target +Conflicts=obmc-chassis-poweron@%i.target [Service] Type=oneshot diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service index d612d61ceb..1c85fc1b94 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service @@ -5,7 +5,7 @@ Wants=obmc-power-start@%i.target Before=obmc-power-start@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-power-chassis-off@%i.target +Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] |