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-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
index 37a326f..26cab2c 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
@@ -5,7 +5,7 @@
inherit obmc-phosphor-systemd
inherit obmc-phosphor-license
-TGTFMT = "obmc-power-chassis-on@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
TMPL_SCAN = "fsi-scan@.service"
INSTFMT_SCAN = "fsi-scan@{0}.service"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
index 77c61f4..82399ae 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
@@ -6,7 +6,7 @@
Before=obmc-host-start-pre@%i.target
Wants=fsi-scan@%i.service
Before=fsi-scan@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
[Service]
@@ -15,4 +15,4 @@
RemainAfterExit=yes
[Install]
-RequiredBy=obmc-power-chassis-on@%i.target
+RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index 8f94e28..4321422 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -4,7 +4,7 @@
After=obmc-power-on@%i.target
Wants=obmc-host-start-pre@%i.target
Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
[Service]
ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
@@ -12,4 +12,4 @@
RemainAfterExit=yes
[Install]
-RequiredBy=obmc-power-chassis-on@%i.target
+RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service
index c6ee466..8b989bb 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service
@@ -6,7 +6,7 @@
After=obmc-power-on@%i.target
Wants=fsi-scan@%i.service
After=fsi-scan@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
ConditionPathExists=!/run/openbmc/chassis@%i-on
ConditionFileExists=/var/lib/obmc/cfam_overrides
@@ -16,4 +16,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
index 8d3e26c..0819d97 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service
@@ -6,7 +6,7 @@
After=obmc-power-on@%i.target
Wants=fsi-scan@%i.service
After=fsi-scan@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
ConditionPathExists=!/run/openbmc/chassis@%i-on
[Service]
@@ -15,4 +15,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb
index b059ff4..4f6a9c6 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb
@@ -12,7 +12,7 @@
TMPL = "cfam_override@.service"
INSTFMT = "cfam_override@{0}.service"
-TGTFMT = "obmc-power-chassis-on@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
SYSTEMD_SERVICE_${PN} += "${TMPL}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb
index 53b84a6..11ad79c 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb
@@ -12,7 +12,7 @@
TMPL = "vcs_workaround@.service"
INSTFMT = "vcs_workaround@{0}.service"
-TGTFMT = "obmc-power-chassis-on@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
SYSTEMD_SERVICE_${PN} += "${TMPL}"