From 530e1d809b87f0646b8131540d57a985b0aca527 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Mon, 23 Nov 2020 19:40:56 -0600 Subject: fans:rainier: Install fan application config files Install all the fan application config files into a rainier image (From meta-ibm rev: dd3117e5c3b6768ca6975b04ebc70f8e716529b2) Change-Id: I51d017b3a6ad34595bc9dce0fd1693c0012fc52e Signed-off-by: Matthew Barth Signed-off-by: Andrew Geissler --- .../fans/phosphor-fan-monitor-config.bbappend | 21 ++++++++++++ .../fans/phosphor-fan-presence-config.bbappend | 20 +++++++++++ .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 39 ++++++++++++++++++++++ 3 files changed, 80 insertions(+) (limited to 'meta-ibm') 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 cb29a7483..dfe220935 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1,11 +1,32 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" +SRC_URI_rainier = "file://rainier-2u/config.json \ + file://rainier-4u/config.json \ + file://everest/config.json \ + " do_install_witherspoon() { install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ } +do_install_rainier() { + # 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 -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 Everest fan monitor config file + install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ + install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ +} + 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" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index 9442477af..efbdea1f3 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1,11 +1,31 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" +SRC_URI_rainier = "file://rainier-2u/config.json \ + file://rainier-4u/config.json \ + file://everest/config.json \ + " do_install_witherspoon() { install -d ${D}/${datadir}/phosphor-fan-presence/presence/ install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ } +do_install_rainier() { + # Install Rainier-2U/4U fan presence config files + install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ + install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ + install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ + install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ + + # Install Everest fan presence config file + install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/ + install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/ +} FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json" FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml" + +FILES_${PN}_remove_rainier = "${presence_datadir}/config.yaml" +FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" +FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" +FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 9f9868fd7..2b6da5946 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -60,6 +60,45 @@ EXTRA_OECONF_append_witherspoon = " --enable-json --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" +EXTRA_OECONF_append_rainier = " --enable-json" +RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" +RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" + +# Install fan control JSON config files +SRC_URI_append_rainier = " \ + file://manager.json \ + file://rainier/fans.json \ + file://rainier-2u/zones.json \ + file://rainier-4u/zones.json \ + file://everest/fans.json \ + file://everest/zones.json" +do_install_append_rainier() { + # 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/ + + # Install Rainier-2U/4U fan config files + install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier + install -m 0644 ${WORKDIR}/rainier/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier/ + + install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ + install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ + 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 Everest fan config files + install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest + 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 = " \ + ${datadir}/phosphor-fan-presence/control/manager.json \ + ${datadir}/phosphor-fan-presence/control/ibm,rainier/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,everest/fans.json \ + ${datadir}/phosphor-fan-presence/control/ibm,everest/zones.json" + # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines SYSTEMD_SUBSTITUTIONS_witherspoon = "ADDR:100:phosphor-fan-control@.service" -- cgit v1.2.3