1s4u: support zones.json for new system
The 1s4u is just like the 2s4u except it has two less fans.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I56ed73ee573df250072bd014a0e4c8a4072e974e
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
index d84b8b8..bc04bda 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -73,6 +73,7 @@
file://rainier-1s4u/fans.json \
file://rainier-2u/zones.json \
file://rainier-4u/zones.json \
+ file://rainier-1s4u/zones.json \
file://everest/fans.json \
file://everest/zones.json"
do_install_append_rainier() {
@@ -88,8 +89,10 @@
install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/
install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/
+ install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/
install -m 0644 ${WORKDIR}/rainier-2u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/
install -m 0644 ${WORKDIR}/rainier-4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/
+ install -m 0644 ${WORKDIR}/rainier-1s4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/
# Install Everest fan config files
install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest
@@ -102,6 +105,7 @@
${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \
${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/zones.json \
${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/zones.json \
+ ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/zones.json \
${datadir}/phosphor-fan-presence/control/ibm,everest/fans.json \
${datadir}/phosphor-fan-presence/control/ibm,everest/zones.json"