summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host
diff options
context:
space:
mode:
authorJosh D. King <jdking@us.ibm.com>2017-04-06 15:56:37 -0500
committerPatrick Williams <patrick@stwcx.xyz>2017-04-20 15:43:45 +0000
commitefb04a1963ee03f7db756cb33ae52f024ffda086 (patch)
treed7dc1bf3dddc378580651944e965b256240fe15b /meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host
parentb9ee536d0aae31718054ddad187a93d761d9dea2 (diff)
downloadtalos-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-openbmc-machines/meta-openpower/common/recipes-phosphor/host')
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service8
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb2
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service
index 14f816ee7..af26186c3 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service
@@ -1,12 +1,12 @@
[Unit]
Description=Start host%i SBE
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
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
ConditionPathExists=!/run/openbmc/host@%i-on
[Service]
@@ -15,4 +15,4 @@ Type=oneshot
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb
index 0caa074d4..0d7d534ed 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}"
TMPL = "start_host@.service"
INSTFMT = "start_host@{0}.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
+TGTFMT = "obmc-host-start@{0}.target"
FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
SYSTEMD_SERVICE_${PN} += "${TMPL}"
OpenPOWER on IntegriCloud