diff options
author | Matthew Barth <msbarth@us.ibm.com> | 2020-05-12 22:08:30 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-27 00:33:33 +0300 |
commit | c358bce9b48a07b86133b443ad07f17d72ddfd6e (patch) | |
tree | 261df904b5ff9f3602211d0aad8fb109d9db4a00 /meta-ibm/recipes-phosphor | |
parent | da4c5d402e510b08dca8353281bc17f90fec679d (diff) | |
download | openbmc-c358bce9b48a07b86133b443ad07f17d72ddfd6e.tar.xz |
witherspoon: Remove `witherspoon` naming from fan watchdog
Remove the use of `witherspoon` in the names of the recipe, config
files, and services of the fan watchdog. This is in prep to use this
same fan watchdog on other machines within meta-ibm that have different
configurations.
Tested:
Witherspoon image matches image prior to change
Flash image to Witherspoon and force watchdog to trip
(From meta-ibm rev: 80f819efec08f7cc7de6988f64c0c77e20990f05)
Change-Id: I77295974397cd4903cd1a723b9ef97ee744d2557
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor')
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/fan-watchdog.bb (renamed from meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog.bb) | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/fan-watchdog/fan-watchdog-monitor@.service (renamed from meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/fan-watchdog/fan-watchdog.service (renamed from meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service) | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/fan-watchdog.conf (renamed from meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/reset-fan-watchdog.conf (renamed from meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/fan-watchdog/reset-fan-watchdog.service (renamed from meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service) | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf | 2 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index 93c8d457b3..d71b378cfb 100644 --- a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -1,4 +1,4 @@ -SUMMARY = "Witherspoon fan watchdog services" +SUMMARY = "Fan watchdog services" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" @@ -8,16 +8,16 @@ inherit obmc-phosphor-systemd RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" RDEPENDS_${PN} += "busybox" -RESET_SERVICE = "witherspoon-reset-fan-watchdog.service" +RESET_SERVICE = "reset-fan-watchdog.service" TGTFMT = "obmc-chassis-poweron@0.target" RESET_FMT = "../${RESET_SERVICE}:${TGTFMT}.requires/${RESET_SERVICE}" -MONITOR_SERVICE = "witherspoon-fan-watchdog-monitor@.service" +MONITOR_SERVICE = "fan-watchdog-monitor@.service" -WATCHDOG_SERVICE = "witherspoon-fan-watchdog.service" +WATCHDOG_SERVICE = "fan-watchdog.service" WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}" SYSTEMD_SERVICE_${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/witherspoon-fan-watchdog/fan-watchdog.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf" diff --git a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service b/meta-ibm/recipes-phosphor/fans/fan-watchdog/fan-watchdog-monitor@.service index 945561b506..945561b506 100644 --- a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/fan-watchdog-monitor@.service diff --git a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service b/meta-ibm/recipes-phosphor/fans/fan-watchdog/fan-watchdog.service index 597ee03cb2..3f941836d8 100644 --- a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/fan-watchdog.service @@ -1,11 +1,11 @@ [Unit] -Description=Witherspoon Fan Watchdog Daemon +Description=Fan Watchdog Daemon Wants=phosphor-fan-monitor-init@0.service Before=phosphor-fan-monitor-init@0.service Conflicts=obmc-fan-watchdog-takeover.target [Service] -EnvironmentFile={envfiledir}/obmc/witherspoon-fan-watchdog/fan-watchdog.conf +EnvironmentFile={envfiledir}/obmc/fan-watchdog/fan-watchdog.conf ExecStart=/sbin/watchdog -T ${{TIMEOUT}} -t ${{INTERVAL}} -F ${{DEVICE}} KillSignal=SIGKILL diff --git a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/fan-watchdog.conf index ce7824ccba..ce7824ccba 100644 --- a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/fan-watchdog.conf diff --git a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/reset-fan-watchdog.conf index b4e5ce74eb..b4e5ce74eb 100644 --- a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/reset-fan-watchdog.conf diff --git a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service b/meta-ibm/recipes-phosphor/fans/fan-watchdog/reset-fan-watchdog.service index 675a672698..f6248f0ee2 100644 --- a/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/reset-fan-watchdog.service @@ -1,5 +1,5 @@ [Unit] -Description=Witherspoon Fan Watchdog Reset +Description=Fan Watchdog Reset Wants=phosphor-fan-monitor-init@0.service Before=phosphor-fan-monitor-init@0.service Conflicts=obmc-chassis-poweroff@0.target @@ -7,6 +7,6 @@ Conflicts=obmc-chassis-poweroff@0.target [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile={envfiledir}/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf +EnvironmentFile={envfiledir}/obmc/fan-watchdog/reset-fan-watchdog.conf ExecStart=/usr/bin/env phosphor-gpio-util -p ${{GPIO_PATH}} -g ${{GPIO}} -a ${{ACTION}} -d ${{DELAY}} SyslogIdentifier=phosphor-gpio-util diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf index 023e61a645..e72de888f9 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf @@ -1,5 +1,5 @@ [Unit] #These overrides allow the fan watchdog to take over when this service dies -OnFailure=witherspoon-fan-watchdog-monitor@%n.service +OnFailure=fan-watchdog-monitor@%n.service StartLimitIntervalSec=5 StartLimitBurst=3 diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 2231cedd19..96a99b36b8 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -21,7 +21,7 @@ EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging" RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" -RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" +RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" |