meta-ibm: prep for new override syntax
Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
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 2c15e03..85cc4d8 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
@@ -1,18 +1,18 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-SRC_URI_witherspoon = "file://config.json"
-SRC_URI_p10bmc = "file://rainier-2u/config.json \
+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() {
+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() {
+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/
@@ -26,11 +26,11 @@
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}: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"
+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"