diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
commit | 0e0df451ae365f09d5c0c766b253f23de26901f2 (patch) | |
tree | db4d7d3ce85e02ee01ad58a86ede02ac876aae77 /meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend | |
parent | e370fd750e2821620ec427f26f8efab0069824ff (diff) | |
parent | 7e10dee74964afa47859704886128dd256acf854 (diff) | |
download | openbmc-0e0df451ae365f09d5c0c766b253f23de26901f2.tar.xz |
Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend')
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend | 16 |
1 files changed, 10 insertions, 6 deletions
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 dfe220935..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,8 +1,9 @@ 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 \ " @@ -11,12 +12,14 @@ 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/ + install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/ install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ + install -m 0644 ${WORKDIR}/rainier-1s4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/ # Install Everest fan monitor config file install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ @@ -26,7 +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,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" |