meta-ampere: Cleanup for Yocto override syntax change

Run convert-overrides.py meta-ampere and update missing changes as
below:
- Change all _mtjade to :mtjade
- Change all _${PN} to :${PN}

Tested:
1. Check compilation without problem.
2. Check basic functions like switch UART mux, power control.

Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I42038b2a98ed1951d6c770bdf49f5fc440f8163e

18 files changed, 60 insertions, 60 deletions

diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
index cf154eee6..c9f27020f 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
@@ -22,10 +22,10 @@ do_install() {
         ${D}${datadir}/${BPN}/ipmi-fru-read.yaml
 }
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
     ${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml \
     ${datadir}/${BPN}/ipmi-extra-properties.yaml \
     ${datadir}/${BPN}/ipmi-fru-read.yaml \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
index 452554c28..b52ae4933 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-RDEPENDS_${PN} += "bash"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
+RDEPENDS:${PN} += "bash"
 
 # Remove what installed by common recipe
 OBMC_CONSOLE_HOST_TTY = ""
-SYSTEMD_SUBSTITUTIONS_remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
-SYSTEMD_SUBSTITUTIONS_remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
-SYSTEMD_SERVICE_${PN}_remove = " \
+SYSTEMD_SUBSTITUTIONS:remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
+SYSTEMD_SUBSTITUTIONS:remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
+SYSTEMD_SERVICE:${PN}:remove = " \
                           ${PN}-ssh.socket \
                           ${PN}-ssh@.service \
                         "
@@ -27,12 +27,12 @@ SRC_URI += "${@compose_list(d, 'CONSOLE_SSH_SERVICE_FILE_FMT', 'HOST_CONSOLE_TTY
 CONSOLE_SSH_SOCKET_FMT = "${PN}-{0}-ssh.socket"
 CONSOLE_SSH_SERVICE_FMT = "${PN}-{0}-ssh@.service"
 
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
                           ${PN}@.service \
                           ${@compose_list(d, 'CONSOLE_SSH_SOCKET_FMT', 'HOST_CONSOLE_TTY')} \
                           ${@compose_list(d, 'CONSOLE_SSH_SERVICE_FMT', 'HOST_CONSOLE_TTY')} \
                         "
-do_install_append() {
+do_install:append() {
     for i in ${HOST_CONSOLE_TTY}
     do
         install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb
index e068b4d24..4994183a0 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit obmc-phosphor-systemd
 
 DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
 
 S = "${WORKDIR}"
 SRC_URI += "file://toggle_fault_led.sh"
@@ -19,7 +19,7 @@ do_install() {
 
 OBMC_FAULT_MONITOR_INSTANCES = "s0_fault_alert s1_fault_alert"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/gpio/s0_fault_alert \
+SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/gpio/s0_fault_alert \
                                    obmc/gpio/s1_fault_alert \
                                   "
 
@@ -28,6 +28,6 @@ INSTFMT = "phosphor-gpio-monitor@{0}.service"
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
-SYSTEMD_SERVICE_${PN} += "ampere_fault_led.service"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}"
+SYSTEMD_SERVICE:${PN} += "ampere_fault_led.service"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}"
 
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb
index 4358b1242..79bfb726e 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb
@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit obmc-phosphor-systemd
 
 DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
 
 OBMC_HOST_ACK_MONITOR_INSTANCES = "reboot_ack shutdown_ack"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/reboot_ack \
+SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/reboot_ack \
                                   obmc/gpio/shutdown_ack \
                                  "
 
@@ -19,5 +19,5 @@ INSTFMT = "phosphor-gpio-monitor@{0}.service"
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
-SYSTEMD_SERVICE_${PN} += "ampere-host-shutdown-ack@.service"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}"
+SYSTEMD_SERVICE:${PN} += "ampere-host-shutdown-ack@.service"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb
index c19cdee18..c1a616a9c 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit obmc-phosphor-systemd
 
 DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
 
 SRC_URI += "file://toggle_identify_led.sh"
 
@@ -16,7 +16,7 @@ do_install() {
             ${D}${bindir}/toggle_identify_led.sh
 }
 
-SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button"
+SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button"
 
 ID_BUTTON_SERVICE = "id_button"
 
@@ -25,5 +25,5 @@ INSTFMT = "phosphor-gpio-monitor@{0}.service"
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
-SYSTEMD_SERVICE_${PN} += "id-button-pressed.service"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}"
+SYSTEMD_SERVICE:${PN} += "id-button-pressed.service"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 0bff1c777..527cbbda0 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
 INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
 POWERSUPPLY_TGT = "multi-user.target"
 FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
 
-SYSTEMD_LINK_${PN}-presence_append_mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
 
 POWERSUPPLY_ENV_FMT  = "obmc/gpio/phosphor-power-supply-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb
index 9f7b24f00..90c4520d1 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb
@@ -7,16 +7,16 @@ inherit obmc-phosphor-systemd
 inherit allarch
 
 DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
 
 OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25"
 
 # Copies config file having arguments for psu
 # via GPIO assertion
-SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \
+SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/PSU1_B25 \
                                   obmc/gpio/PSU2_B25 \
                                  "
-SYSTEMD_SERVICE_${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service"
+SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service"
 
 SRC_URI += "file://ampere_psu_reset_hotswap.sh"
 
@@ -30,4 +30,4 @@ GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service"
 GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service"
 TGT = "multi-user.target"
 PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb
index 0c4b56f72..1b5a119b1 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb
@@ -14,4 +14,4 @@ do_install() {
         install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml
 }
 
-FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml"
+FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index a8856809b..ab3030879 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,10 +1,10 @@
-DEPENDS_append_mtjade = " inventory-cleanup"
+DEPENDS:append:mtjade = " inventory-cleanup"
 
-FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append_mtjade = " associations"
-SRC_URI_append_mtjade = " file://associations.json"
+FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
+PACKAGECONFIG:append:mtjade = " associations"
+SRC_URI:append:mtjade = " file://associations.json"
 
-do_install_append_mtjade() {
+do_install:append:mtjade() {
     install -d ${D}${base_datadir}
     install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}
 }
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 83a929746..23358f003 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index be3e7fe5e..5150e2312 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,12 +1,12 @@
 inherit obmc-phosphor-systemd
 
-DEPENDS_append_mtjade = " mtjade-yaml-config"
+DEPENDS:append:mtjade = " mtjade-yaml-config"
 
-EXTRA_OECONF_mtjade = " \
+EXTRA_OECONF:mtjade = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-extra-properties.yaml \
     "
-FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
 
 EEPROM_NAMES = "motherboard"
 
@@ -16,11 +16,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
 EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
 
 ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
 
 TMPL = "obmc-read-eeprom@.service"
 TGT = "multi-user.target"
 INSTFMT = "obmc-read-eeprom@{0}.service"
 FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
 
-SYSTEMD_LINK_${PN}_append_mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index b8ea8d8d5..fce5b74eb 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,23 +1,23 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
 
-DEPENDS_append_mtjade = " mtjade-yaml-config"
+DEPENDS:append:mtjade = " mtjade-yaml-config"
 
-RRECOMMENDS_${PN} += "ipmitool"
-RDEPENDS_${PN} += "bash"
+RRECOMMENDS:${PN} += "ipmitool"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI += " \
             file://ampere-phosphor-softpoweroff \
             file://ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
             "
 
-EXTRA_OECONF_mtjade = " \
+EXTRA_OECONF:mtjade = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors-${MACHINE}.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
     "
 
 AMPERE_SOFTPOWEROFF_TMPL = "ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service"
 
-do_install_append_mtjade(){
+do_install:append:mtjade(){
     install -d ${D}${includedir}/phosphor-ipmi-host
     install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host
     install -m 0755 ${WORKDIR}/ampere-phosphor-softpoweroff ${D}/${bindir}/phosphor-softpoweroff
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 33802713d..f37f4f50e 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,7 +1,7 @@
 DEFAULT_RMCPP_IFACE = "eth1"
 
 ALT_RMCPP_IFACE = "eth0"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
         ${PN}@${ALT_RMCPP_IFACE}.service \
         ${PN}@${ALT_RMCPP_IFACE}.socket \
         "
diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index ca86a4a21..e9e6aa0ad 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,6 +1,6 @@
-RDEPENDS_${PN}-extras_append_mtjade = " webui-vue phosphor-image-signing phosphor-virtual-sensor"
-RDEPENDS_${PN}-inventory_append_mtjade = " fault-monitor id-button psu-hotswap-reset"
+RDEPENDS:${PN}-extras:append:mtjade = " webui-vue phosphor-image-signing phosphor-virtual-sensor"
+RDEPENDS:${PN}-inventory:append:mtjade = " fault-monitor id-button psu-hotswap-reset"
 
-RDEPENDS_${PN}-inventory_append_mtjade = " \
+RDEPENDS:${PN}-inventory:append:mtjade = " \
                                         host-gpio-handling \
                                         "
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 821c9b100..11cdbe666 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
 
-EXTRA_OEMESON_append_mtjade = " -Dnegative-errno-on-fail=true"
+EXTRA_OEMESON:append:mtjade = " -Dnegative-errno-on-fail=true"
 
-CHIPS_mtjade = " \
+CHIPS:mtjade = " \
         bus@1e78a000/i2c-bus@100/tmp175@28 \
         bus@1e78a000/i2c-bus@100/tmp175@29 \
         bus@1e78a000/i2c-bus@100/tmp175@2a \
@@ -21,9 +21,9 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS_${MACHINE}')}"
 ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf"
 
 ENVS = "obmc/${MACHINE}/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
 
-do_install_append_mtjade() {
+do_install:append:mtjade() {
   SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon"
   DESTDIR="${D}${sysconfdir}/default/obmc"
   install -d ${DESTDIR}
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 3c68ff533..3a1af4f3b 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_mtjade += " \
+SRC_URI:append:mtjade += " \
             file://virtual_sensor_config.json \
            "
 
-do_install_append_mtjade() {
+do_install:append:mtjade() {
     install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/
 }
 
diff --git a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 83a929746..23358f003 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index 0d17c372a..51081539e 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
 
 #
 # Ampere Mt. Jade power control involves different action during