diff options
author | Josh D. King <jdking@us.ibm.com> | 2017-04-06 15:56:37 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-04-20 15:43:45 +0000 |
commit | efb04a1963ee03f7db756cb33ae52f024ffda086 (patch) | |
tree | d7dc1bf3dddc378580651944e965b256240fe15b /meta-phosphor/common/recipes-phosphor | |
parent | b9ee536d0aae31718054ddad187a93d761d9dea2 (diff) | |
download | talos-openbmc-efb04a1963ee03f7db756cb33ae52f024ffda086.tar.gz talos-openbmc-efb04a1963ee03f7db756cb33ae52f024ffda086.zip |
Refactor action target names Host-start-stop
The target change is:
obmc-chassis-stop -> obmc-host-stop
obmc-chassis-start -> obmc-host-start
Removed CHASSIS_FMT and CHASSIS_LINK_FMT
because they are no longer needed.
CHASSIS_POWER_FMT_2 did not change because
its used for obmc-chassis-reset.
Deleted files obmc-chassis-start@.target and
obmc-chassis-stop@.target because they are
no longer needed. I moved over their contents
to obmc-host-start and obmc-host-stop.
Updated phosphor-state-manager.bb and
skeleton-rev.bbclass to have correct commit
id.
Change-Id: I26cba4153038f39d60e8d450a05969a216848abe
Signed-off-by: Josh D. King <jdking@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor')
15 files changed, 25 insertions, 25 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 44421bd92..2672335d4 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 @@ -66,13 +66,13 @@ SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWE # Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-chassis-poweron@.target" -START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target" +START_TGTFMT_CTRL = "obmc-host-start@{1}.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-chassis-poweroff@.target" -STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target" +STOP_TGTFMT_CTRL = "obmc-host-stop@{1}.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 f76695e7b..befc89296 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 @@ -15,4 +15,4 @@ Type=oneshot ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1 [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target 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 86ddf4a32..dd3570e01 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 @@ -12,4 +12,4 @@ RemainAfterExit=yes ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0 [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target 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 32ae6942d..a5efb4133 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 @@ -14,4 +14,4 @@ ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i off ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target 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 1c85fc1b9..cd4f513a0 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 @@ -15,4 +15,4 @@ ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i on TimeoutSec=30 [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb index 7af067ffb..b0709587a 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb @@ -8,7 +8,7 @@ inherit obmc-phosphor-systemd SKELETON_DIR = "pciedetect" TMPL = "pcie-slot-detect@.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" INSTFMT = "pcie-slot-detect@{0}.service" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service index 532d5e9bf..6cc65f892 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service @@ -2,7 +2,7 @@ Description=PCIE Slot Presence Detection For Chassis%i Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Type=oneshot @@ -10,4 +10,4 @@ RemainAfterExit=yes ExecStart={sbindir}/pcie_slot_present.exe [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb index 77017e31c..d065d631b 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb @@ -12,12 +12,12 @@ DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_WATCHDOG_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "obmc-start-watchdog@.service obmc-stop-watchdog@.service" START_TMPL = "obmc-start-watchdog@.service" -START_TGTFMT = "obmc-chassis-start@{1}.target" +START_TGTFMT = "obmc-host-start@{1}.target" START_INSTFMT = "obmc-start-watchdog@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" STOP_TMPL = "obmc-stop-watchdog@.service" -STOP_TGTFMT = "obmc-chassis-stop@{1}.target" +STOP_TGTFMT = "obmc-host-stop@{1}.target" STOP_INSTFMT = "obmc-stop-watchdog@{0}.service" STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service index d28bfe839..77ed037a5 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service @@ -4,7 +4,7 @@ Wants=obmc-host-started@%i.target After=obmc-host-started@%i.target Wants=mapper-wait@-org-openbmc-watchdog-host%i.service After=mapper-wait@-org-openbmc-watchdog-host%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] @@ -14,4 +14,4 @@ ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdo ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog start [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service index 2b086cf2c..d1494036f 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service @@ -2,7 +2,7 @@ Description=Stop Watchdog%i Wants=mapper-wait@-org-openbmc-watchdog-host%i.service After=mapper-wait@-org-openbmc-watchdog-host%i.service -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-host-start@%i.target [Service] Type=oneshot @@ -10,4 +10,4 @@ RemainAfterExit=yes ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog stop [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb index a064cf1b0..201849a08 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb @@ -34,10 +34,10 @@ RDEPENDS_${PN}-tach += "sdbusplus" RDEPENDS_phosphor-chassis-cooling-type += "libevdev" -# Needed to install into the obmc-chassis-start target +# Needed to install into the obmc-host-start target TMPL = "phosphor-fan-presence-tach@.service" INSTFMT = "phosphor-fan-presence-tach@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-host-start@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" FILES_${PN}-tach = "${sbindir}/phosphor-fan-presence-tach" diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service index ac153895e..8324fdb0c 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service @@ -2,11 +2,11 @@ Description=Phosphor Fan Presence Tach Daemon Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target [Service] Restart=on-failure ExecStart={sbindir}/phosphor-fan-presence-tach [Install] -RequiredBy=obmc-chassis-start@%i.target +RequiredBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb index fa5a00656..8533c8eab 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb @@ -19,7 +19,7 @@ SYSTEMD_SERVICE_${PN} = " \ " START_TMPL = "op-start-host@.service" -START_TGTFMT = "obmc-chassis-start@{1}.target" +START_TGTFMT = "obmc-host-start@{1}.target" START_INSTFMT = "obmc-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service index 7f3871efc..9a6ffe60b 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service @@ -7,7 +7,7 @@ ConditionPathExists=/run/openbmc/host@%i-on [Service] RemainAfterExit=no # TODO: openbmc/openbmc#1205 - target name refactor -ExecStart=/bin/systemctl start obmc-chassis-start@%i.target +ExecStart=/bin/systemctl start obmc-host-start@%i.target [Install] diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service index 8c5cfbb5d..c9d1a7c5c 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service @@ -1,14 +1,14 @@ [Unit] Description=Start Host%i After=obmc-host-start-pre@%i.target -Wants=obmc-host-start@%i.target -Before=obmc-host-start@%i.target +Wants=obmc-host-starting@%i.target +Before=obmc-host-starting@%i.target Before=obmc-host-started@%i.target Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Wants=mapper-wait@-org-openbmc-control-host%i.service After=mapper-wait@-org-openbmc-control-host%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] @@ -17,4 +17,4 @@ RemainAfterExit=yes ExecStart={sbindir}/mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-host-start@%i.target |