diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2021-03-25 19:40:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-04-08 19:38:21 +0300 |
commit | 6234872b26397cb8b114e4c4bc48a22666ae86cb (patch) | |
tree | 1e0c54042ccb103adb2d2987d2aab9e255e34c34 /meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | |
parent | 0b9dc0a6bf95fd13aca170e0e3fac8a3b120e336 (diff) | |
download | openbmc-6234872b26397cb8b114e4c4bc48a22666ae86cb.tar.xz |
ibm: fans: Replace rainier with p10bmc
The IBM rainier machine name is being replaced with the generic p10bmc.
Tested: Built rainier and verified the fan files were installed, ex:
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-4u/zones.json
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-2u/zones.json
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,everest/zones.json
Change-Id: I10edb9e30716cffa3f510fe94822eadb08326912
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend')
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index bc04bda6b..7de421656 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -34,16 +34,16 @@ SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf: SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service @@ -61,13 +61,13 @@ EXTRA_OECONF_append_witherspoon = " --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -PACKAGECONFIG_append_rainier = " json sensor-monitor" -FAN_PACKAGES_append_rainier = " sensor-monitor" -RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" -RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" +PACKAGECONFIG_append_p10bmc = " json sensor-monitor" +FAN_PACKAGES_append_p10bmc = " sensor-monitor" +RDEPENDS_${PN}-presence-tach_append_p10bmc = " phosphor-fan-presence-config" +RDEPENDS_${PN}-monitor_append_p10bmc = " phosphor-fan-monitor-config" # Install fan control JSON config files -SRC_URI_append_rainier = " \ +SRC_URI_append_p10bmc = " \ file://manager.json \ file://rainier/fans.json \ file://rainier-1s4u/fans.json \ @@ -76,7 +76,7 @@ SRC_URI_append_rainier = " \ file://rainier-1s4u/zones.json \ file://everest/fans.json \ file://everest/zones.json" -do_install_append_rainier() { +do_install_append_p10bmc() { # Install fan control manager config file install -d ${D}/${datadir}/phosphor-fan-presence/control/ install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/ @@ -99,7 +99,7 @@ do_install_append_rainier() { install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ } -FILES_${PN}-control_append_rainier = " \ +FILES_${PN}-control_append_p10bmc = " \ ${datadir}/phosphor-fan-presence/control/manager.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \ |