meta-ibm: prep for new override syntax

Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

6 files changed, 19 insertions, 19 deletions

diff --git a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
index fd27f7dce..986c2ca9f 100644
--- a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -1,9 +1,9 @@
-DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
-DEPENDS_append_mihawk = " acx22-yaml-config"
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+DEPENDS:append:mihawk = " acx22-yaml-config"
 
-EXTRA_OECONF_ibm-ac-server = " \
+EXTRA_OECONF:ibm-ac-server = " \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     "
-EXTRA_OECONF_mihawk = " \
+EXTRA_OECONF:mihawk = " \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     "
\ No newline at end of file
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 7898a1039..d490c0874 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # Calculate the auxiliary firmware revision to be updated in the dev_id.json
 # file. It is calculated from the VERSION_ID field which currently has two
@@ -16,7 +16,7 @@ inherit image_version
 unset do_patch[noexec]
 do_patch[depends] = "os-release:do_populate_sysroot"
 
-python do_patch_ibm-ac-server() {
+python do_patch:ibm-ac-server() {
     import json
     import re
     from shutil import copyfile
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 6efe241bc..30245d39a 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,11 +1,11 @@
-DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
-DEPENDS_append_mihawk = " acx22-yaml-config"
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+DEPENDS:append:mihawk = " acx22-yaml-config"
 
-EXTRA_OECONF_ibm-ac-server = " \
+EXTRA_OECONF:ibm-ac-server = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
     "
-EXTRA_OECONF_mihawk = " \
+EXTRA_OECONF:mihawk = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
     "
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 8d51478af..38fbd717c 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,12 +1,12 @@
-DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
-DEPENDS_append_mihawk = " acx22-yaml-config"
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+DEPENDS:append:mihawk = " acx22-yaml-config"
 
-EXTRA_OECONF_ibm-ac-server = " \
+EXTRA_OECONF:ibm-ac-server = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     "
-EXTRA_OECONF_mihawk = " \
+EXTRA_OECONF:mihawk = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index c847c0564..a157e0d04 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,5 +1,5 @@
-ALT_RMCPP_IFACE_mihawk  = "eth1"
-SYSTEMD_SERVICE_${PN}_append_mihawk += " \
+ALT_RMCPP_IFACE:mihawk  = "eth1"
+SYSTEMD_SERVICE:${PN}:append:mihawk += " \
     ${PN}@${ALT_RMCPP_IFACE}.service \
     ${PN}@${ALT_RMCPP_IFACE}.socket \
     "
diff --git a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb
index 8ee9e33cd..e72755d0c 100644
--- a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb
+++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb
@@ -16,8 +16,8 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem"
 SRCREV = "ba89a1ea570cb010c2e929ac11ada3714878ca7d"
 
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
 
 HOSTIPMI_PROVIDER_LIBRARY += "libwistronoem.so"