From 6234872b26397cb8b114e4c4bc48a22666ae86cb Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 16:40:34 +0000 Subject: 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 --- .../fans/phosphor-fan-monitor-config.bbappend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend') diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index 8b63927ea..2c15e034a 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" -SRC_URI_rainier = "file://rainier-2u/config.json \ +SRC_URI_p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ file://rainier-1s4u/config.json \ file://everest/config.json \ @@ -12,7 +12,7 @@ do_install_witherspoon() { install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ } -do_install_rainier() { +do_install_p10bmc() { # Install Rainier-2U/4U fan monitor config files install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ @@ -29,8 +29,8 @@ do_install_rainier() { FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_remove_rainier = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" +FILES_${PN}_remove_p10bmc = "${monitor_datadir}/monitor.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" -- cgit v1.2.3