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/dbus/events-policy.bb b/meta-ibm/recipes-phosphor/dbus/events-policy.bb
index 52cb313..676466b 100644
--- a/meta-ibm/recipes-phosphor/dbus/events-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/events-policy.bb
@@ -6,7 +6,7 @@
inherit allarch
inherit phosphor-dbus-monitor
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://config.yaml"
@@ -14,4 +14,4 @@
install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml
}
-FILES_${PN} += "${config_dir}/config.yaml"
+FILES:${PN} += "${config_dir}/config.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
index 8bfecd3..f542725 100644
--- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
@@ -6,29 +6,29 @@
inherit allarch
inherit phosphor-dbus-monitor
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://air-cooled.yaml"
-SRC_URI_append_ibm-ac-server = " file://water-cooled.yaml"
+SRC_URI:append:ibm-ac-server = " file://water-cooled.yaml"
SRC_URI += "file://fan-errors.yaml"
-SRC_URI_remove_p10bmc = "file://air-cooled.yaml"
-SRC_URI_remove_p10bmc = "file://fan-errors.yaml"
+SRC_URI:remove:p10bmc = "file://air-cooled.yaml"
+SRC_URI:remove:p10bmc = "file://fan-errors.yaml"
-do_install_append_ibm-ac-server() {
+do_install:append:ibm-ac-server() {
install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml
install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml
}
-do_install_append_mihawk() {
+do_install:append:mihawk() {
install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml
}
-FILES_${PN} += "${config_dir}/air-cooled.yaml"
-FILES_${PN}_append_ibm-ac-server = " ${config_dir}/water-cooled.yaml"
-FILES_${PN} += "${config_dir}/fan-errors.yaml"
+FILES:${PN} += "${config_dir}/air-cooled.yaml"
+FILES:${PN}:append:ibm-ac-server = " ${config_dir}/water-cooled.yaml"
+FILES:${PN} += "${config_dir}/fan-errors.yaml"
-FILES_${PN}_remove_p10bmc = "${config_dir}/air-cooled.yaml"
-FILES_${PN}_remove_p10bmc = "${config_dir}/fan-errors.yaml"
+FILES:${PN}:remove:p10bmc = "${config_dir}/air-cooled.yaml"
+FILES:${PN}:remove:p10bmc = "${config_dir}/fan-errors.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
index b8489d6..14c1255 100644
--- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
+++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
@@ -7,5 +7,5 @@
inherit phosphor-mapper
inherit native
-PHOSPHOR_MAPPER_SERVICE_append = " com.ibm"
-PHOSPHOR_MAPPER_INTERFACE_append = " com.ibm"
+PHOSPHOR_MAPPER_SERVICE:append = " com.ibm"
+PHOSPHOR_MAPPER_INTERFACE:append = " com.ibm"
diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb
index 99b933a..f8b3da2 100644
--- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb
+++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb
@@ -25,7 +25,7 @@
libsystemd \
"
-PACKAGECONFIG_remove_class-native = "libibm_dbus"
-PACKAGECONFIG_remove_class-nativesdk = "libibm_dbus"
+PACKAGECONFIG:remove:class-native = "libibm_dbus"
+PACKAGECONFIG:remove:class-nativesdk = "libibm_dbus"
BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index 8437cba..7ed24ff 100644
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
@@ -1,11 +1,11 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " events-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " snmp-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " events-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " snmp-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_p10bmc = " snmp-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " fan-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " thermal-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " power-supply-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " snmp-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " fan-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " thermal-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " power-supply-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " snmp-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:p10bmc = " snmp-policy"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
index 5c9d0b1..3071cb4 100644
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
@@ -1,2 +1,2 @@
-SYSTEMD_LINK_phosphor-msl-verify_append_ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
-SYSTEMD_LINK_phosphor-msl-verify_append_mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
+SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
+SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
index d94a554..25ab376 100644
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
@@ -1 +1 @@
-PHOSPHOR_MAPPER_CONFIGS_append = " ibm-dbus-interfaces-mapper-config-native"
+PHOSPHOR_MAPPER_CONFIGS:append = " ibm-dbus-interfaces-mapper-config-native"
diff --git a/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb
index 8d3df46..b55efb3 100644
--- a/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb
@@ -6,7 +6,7 @@
inherit allarch
inherit phosphor-dbus-monitor
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://power-supply-policy.yaml"
@@ -14,4 +14,4 @@
install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml
}
-FILES_${PN} += "${config_dir}/power-supply-policy.yaml"
+FILES:${PN} += "${config_dir}/power-supply-policy.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb
index 500c674..94fce40 100644
--- a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb
@@ -6,7 +6,7 @@
inherit allarch
inherit phosphor-dbus-monitor
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://snmp-config.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb
index b5b38ba..5c381b4 100644
--- a/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb
@@ -6,7 +6,7 @@
inherit allarch
inherit phosphor-dbus-monitor
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI = "file://thermal-policy.yaml"
@@ -14,4 +14,4 @@
install -D ${WORKDIR}/thermal-policy.yaml ${D}${config_dir}/thermal-policy.yaml
}
-FILES_${PN} += "${config_dir}/thermal-policy.yaml"
+FILES:${PN} += "${config_dir}/thermal-policy.yaml"