From 810504de6665d0c48040787c7bbd52d1c90ee0cc Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Thu, 19 Aug 2021 10:45:32 -0500 Subject: meta-ibm:fans:monitor: Use JSON config files installed from repo The `witherspoon` and `p10bmc` machines' JSON config files should now use the JSON config files installed from the repository. Change-Id: I47669745aa7047c4de64ee8aedc98437593a3b62 Signed-off-by: Matthew Barth --- .../fans/phosphor-fan-monitor-config.bbappend | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend (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 deleted file mode 100644 index 85cc4d82e9..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI:witherspoon = "file://config.json" -SRC_URI:p10bmc = "file://rainier-2u/config.json \ - file://rainier-4u/config.json \ - file://rainier-1s4u/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: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/ - 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: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