Remove witherspoon prefix from pfault-analysis
Remove the witherspoon prefix from the witherspoon-pfault-analysis based
recipes for applications and service files to avoid confusion when these
are reused by Swift.
Point to latest commit of witherspoon-pfault-analysis.
Requires:
I4c7275c3b14b3b3724abb98b8d43610df4f9c2a3
https://gerrit.openbmc-project.xyz/c/openbmc/witherspoon-pfault-analysis/+/19399
Change-Id: Ic6c8c78b9bddc363a34eb2246bffd094ff1008de
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service
similarity index 62%
rename from meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
rename to meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service
index 56e2d21..bf02758 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Witherspoon Power Supply %I Monitor
+Description=Power Supply %I Monitor
Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
Wants=mapper-wait@-org-openbmc-control-power0.service
@@ -8,8 +8,8 @@
[Service]
EnvironmentFile={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf
-ExecStart=/usr/bin/env witherspoon-psu-monitor --path=${{DEVPATH}} --instance=${{INSTANCE}} --inventory=${{INVENTORY}} --num-history-records=${{NUM_HISTORY_RECORDS}} --sync-gpio-path=${{SYNC_GPIO_PATH}} --sync-gpio-num=${{SYNC_GPIO_NUM}}
-SyslogIdentifier=witherspoon-psu-monitor
+ExecStart=/usr/bin/env psu-monitor --path=${{DEVPATH}} --instance=${{INSTANCE}} --inventory=${{INVENTORY}} --num-history-records=${{NUM_HISTORY_RECORDS}} --sync-gpio-path=${{SYNC_GPIO_PATH}} --sync-gpio-num=${{SYNC_GPIO_NUM}}
+SyslogIdentifier=psu-monitor
[Install]
RequiredBy=multi-user.target
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor-pgood.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor-pgood.service
new file mode 100644
index 0000000..458c5e6
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor-pgood.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Power Sequencer Power-on Monitor
+Wants=op-power-start@0.service
+After=op-power-start@0.service
+Wants=power-workarounds@0.service
+After=power-workarounds@0.service
+Conflicts=obmc-chassis-poweroff@0.target
+ConditionPathExists=!/run/openbmc/chassis@0-on
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env pseq-monitor -a pgood-monitor -i 5000
+SyslogIdentifier=pseq-monitor
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service
new file mode 100644
index 0000000..8ce3b37
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Power Sequencer Runtime Monitor
+Wants=obmc-host-start-pre@0.target
+Before=obmc-host-start-pre@0.target
+After=obmc-power-on@0.target
+Conflicts=obmc-chassis-poweroff@0.target
+
+[Service]
+ExecStart=/usr/bin/env pseq-monitor -a runtime-monitor -i 500
+SyslogIdentifier=pseq-monitor
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor-pgood.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor-pgood.service
deleted file mode 100644
index ff6bcd1..0000000
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor-pgood.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Witherspoon Power Sequencer Power-on Monitor
-Wants=op-power-start@0.service
-After=op-power-start@0.service
-Wants=power-workarounds@0.service
-After=power-workarounds@0.service
-Conflicts=obmc-chassis-poweroff@0.target
-ConditionPathExists=!/run/openbmc/chassis@0-on
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/env witherspoon-pseq-monitor -a pgood-monitor -i 5000
-SyslogIdentifier=witherspoon-pseq-monitor
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service
deleted file mode 100644
index 6e76c8f..0000000
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Witherspoon Power Sequencer Runtime Monitor
-Wants=obmc-host-start-pre@0.target
-Before=obmc-host-start-pre@0.target
-After=obmc-power-on@0.target
-Conflicts=obmc-chassis-poweroff@0.target
-
-[Service]
-ExecStart=/usr/bin/env witherspoon-pseq-monitor -a runtime-monitor -i 500
-SyslogIdentifier=witherspoon-pseq-monitor