meta-quanta: meta-gbs: Cleanup for Yocto override syntax change

Cleanup with
```
convert-overrides.py meta-quanta/meta-gbs

git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gbs

git grep -l _gbs -- meta-quanta/meta-gbs \
  | xargs sed -i 's/_gbs/:gbs/'
```

After cleanup
```
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gbs/ | grep '.bb'
meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend:addtask do_gbs_prepare_xmls after do_patch before do_install
meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb:do_install () {
meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend:do_install:append:gbs(){
meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend:do_install:append:gbs() {
meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend:do_install:append:gbs() {
```

Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: If640ddd3c6f6084bb0a1d82e2d18fa2640d9d83e

41 files changed, 213 insertions, 213 deletions

diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index ec03a3ad6..3f738a053 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "gbs-layer"
 BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott honister"
diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample
index f590e64f8..9b0e14fb8 100644
--- a/meta-quanta/meta-gbs/conf/local.conf.sample
+++ b/meta-quanta/meta-gbs/conf/local.conf.sample
@@ -1,11 +1,11 @@
 MACHINE ??= "gbs"
 DISTRO ?= "gbmc"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+USER_CLASSES ?= "buildstats"
 PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index 59973e80c..f2ab09ccb 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -25,35 +25,35 @@ PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update"
 PREFERRED_PROVIDER_virtual/bmc-update = "gbs-bmc-update"
 
 # Remove unneeded binaries from image
-IMAGE_FEATURES_remove = "obmc-bmc-state-mgmt"
-IMAGE_FEATURES_remove = "obmc-bmcweb"
-IMAGE_FEATURES_remove = "obmc-chassis-mgmt"
-IMAGE_FEATURES_remove = "obmc-chassis-state-mgmt"
-IMAGE_FEATURES_remove = "obmc-console"
-IMAGE_FEATURES_remove = "obmc-dbus-monitor"
-IMAGE_FEATURES_remove = "obmc-devtools"
-IMAGE_FEATURES_remove = "obmc-fan-control"
-IMAGE_FEATURES_remove = "obmc-fan-mgmt"
-IMAGE_FEATURES_remove = "obmc-flash-mgmt"
-IMAGE_FEATURES_remove = "obmc-fru-ipmi"
-IMAGE_FEATURES_remove = "obmc-health-monitor"
-IMAGE_FEATURES_remove = "obmc-host-ctl"
-IMAGE_FEATURES_remove = "obmc-host-ipmi"
-IMAGE_FEATURES_remove = "obmc-host-state-mgmt"
-IMAGE_FEATURES_remove = "obmc-ikvm"
-IMAGE_FEATURES_remove = "obmc-inventory"
-IMAGE_FEATURES_remove = "obmc-leds"
-IMAGE_FEATURES_remove = "obmc-logging-mgmt"
-IMAGE_FEATURES_remove = "obmc-remote-logging-mgmt"
-IMAGE_FEATURES_remove = "obmc-rng"
-IMAGE_FEATURES_remove = "obmc-net-ipmi"
-IMAGE_FEATURES_remove = "obmc-sensors"
-IMAGE_FEATURES_remove = "obmc-software"
-IMAGE_FEATURES_remove = "obmc-system-mgmt"
-IMAGE_FEATURES_remove = "obmc-telemetry"
-IMAGE_FEATURES_remove = "obmc-debug-collector"
-IMAGE_FEATURES_remove = "obmc-settings-mgmt"
-IMAGE_FEATURES_remove = "obmc-network-mgmt"
-IMAGE_FEATURES_remove = "obmc-user-mgmt"
-IMAGE_FEATURES_remove = "obmc-user-mgmt-ldap"
-OBMC_IMAGE_BASE_INSTALL_remove = "packagegroup-obmc-apps-extras"
+IMAGE_FEATURES:remove = "obmc-bmc-state-mgmt"
+IMAGE_FEATURES:remove = "obmc-bmcweb"
+IMAGE_FEATURES:remove = "obmc-chassis-mgmt"
+IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt"
+IMAGE_FEATURES:remove = "obmc-console"
+IMAGE_FEATURES:remove = "obmc-dbus-monitor"
+IMAGE_FEATURES:remove = "obmc-devtools"
+IMAGE_FEATURES:remove = "obmc-fan-control"
+IMAGE_FEATURES:remove = "obmc-fan-mgmt"
+IMAGE_FEATURES:remove = "obmc-flash-mgmt"
+IMAGE_FEATURES:remove = "obmc-fru-ipmi"
+IMAGE_FEATURES:remove = "obmc-health-monitor"
+IMAGE_FEATURES:remove = "obmc-host-ctl"
+IMAGE_FEATURES:remove = "obmc-host-ipmi"
+IMAGE_FEATURES:remove = "obmc-host-state-mgmt"
+IMAGE_FEATURES:remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-inventory"
+IMAGE_FEATURES:remove = "obmc-leds"
+IMAGE_FEATURES:remove = "obmc-logging-mgmt"
+IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt"
+IMAGE_FEATURES:remove = "obmc-rng"
+IMAGE_FEATURES:remove = "obmc-net-ipmi"
+IMAGE_FEATURES:remove = "obmc-sensors"
+IMAGE_FEATURES:remove = "obmc-software"
+IMAGE_FEATURES:remove = "obmc-system-mgmt"
+IMAGE_FEATURES:remove = "obmc-telemetry"
+IMAGE_FEATURES:remove = "obmc-debug-collector"
+IMAGE_FEATURES:remove = "obmc-settings-mgmt"
+IMAGE_FEATURES:remove = "obmc-network-mgmt"
+IMAGE_FEATURES:remove = "obmc-user-mgmt"
+IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap"
+OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras"
diff --git a/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend b/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
index 06bc31f6a..0921a809e 100644
--- a/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append += "file://BootBlockAndHeader_GBS.xml"
-SRC_URI_append += "file://UbootHeader_GBS.xml"
+SRC_URI:append += "file://BootBlockAndHeader_GBS.xml"
+SRC_URI:append += "file://UbootHeader_GBS.xml"
 
 # Prepare the Bootblock XMLs.
 do_gbs_prepare_xmls() {
diff --git a/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend b/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend
index 6947a4cbb..adced6348 100644
--- a/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://busybox.cfg"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://busybox.cfg"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb
index 61c6ed407..464f7b86b 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = " file://boot-status-led.sh \
             file://boot-status-led.service \
@@ -22,4 +22,4 @@ do_install() {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "boot-status-led.service"
+SYSTEMD_SERVICE:${PN} = "boot-status-led.service"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb b/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb
index afe91fc60..e28bc37c0 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb
@@ -12,9 +12,9 @@ SRC_URI = " file://cpld_version.sh \
 S = "${WORKDIR}"
 
 DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
-SYSTEMD_SERVICE_${PN} = "cpld-version.service"
+SYSTEMD_SERVICE:${PN} = "cpld-version.service"
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb
index 0ea731c35..b02842f19 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb
@@ -10,10 +10,10 @@ inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 PROVIDES += "virtual/bios-update"
-RPROVIDES_${PN} += "virtual/bios-update"
+RPROVIDES:${PN} += "virtual/bios-update"
 
 SRC_URI += " file://bios-verify.sh \
              file://bios-update.sh \
@@ -22,7 +22,7 @@ SRC_URI += " file://bios-verify.sh \
              file://config-bios.json \
            "
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
 
 do_install() {
     install -d ${D}${bindir}
@@ -39,4 +39,4 @@ do_install() {
 
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "phosphor-ipmi-flash-bios-verify.service phosphor-ipmi-flash-bios-update.service"
+SYSTEMD_SERVICE:${PN} = "phosphor-ipmi-flash-bios-verify.service phosphor-ipmi-flash-bios-update.service"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb
index da672001e..fea9ce1b5 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb
@@ -10,14 +10,14 @@ SRC_URI = " file://phosphor-ipmi-flash-bmc-verify.service \
             file://config-bmc.json \
           "
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
 
 PROVIDES += "virtual/bmc-update"
-RPROVIDES_${PN} += "virtual/bmc-update"
+RPROVIDES:${PN} += "virtual/bmc-update"
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 do_install() {
     install -d ${D}${bindir}
@@ -32,4 +32,4 @@ do_install() {
 
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "phosphor-ipmi-flash-bmc-verify.service"
+SYSTEMD_SERVICE:${PN} = "phosphor-ipmi-flash-bmc-verify.service"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb
index 3e1a6d8ac..b74089cd8 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = " file://detect-gpio-present.sh \
             file://detect-gpio-present.service \
@@ -22,4 +22,4 @@ do_install() {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "detect-gpio-present.service"
+SYSTEMD_SERVICE:${PN} = "detect-gpio-present.service"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb
index 8b5551e79..bc6c700bb 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 
 SRC_URI += "file://entity_association_map.json"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${datadir}/ipmi-entity-association/entity_association_map.json \
     "
 
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb
index c9d595a3d..ffc0871d8 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN} += "i2c-tools"
-RDEPENDS_${PN} += "jq"
-RDEPENDS_${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
+RDEPENDS:${PN} += "i2c-tools"
+RDEPENDS:${PN} += "jq"
+RDEPENDS:${PN} += "libsystemd"
 
 SRC_URI = "file://gbs-sysinit.sh \
            file://gbs-gpio-common.sh \
@@ -29,4 +29,4 @@ do_install () {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "gbs-sysinit.service"
+SYSTEMD_SERVICE:${PN} = "gbs-sysinit.service"
diff --git a/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb b/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb
index 7c28dc28d..e1cb2ac71 100644
--- a/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb
+++ b/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN} += "libgpiod-tools"
+RDEPENDS:${PN} += "bash"
+RDEPENDS:${PN} += "libgpiod-tools"
 
 SRC_URI = " file://hotswap-power-cycle.service \
             file://tray_powercycle.sh \
@@ -23,5 +23,5 @@ do_install() {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "hotswap-power-cycle.service"
+SYSTEMD_SERVICE:${PN} = "hotswap-power-cycle.service"
 
diff --git a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend
index f833b5577..0c20dc4fb 100644
--- a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
-SRC_URI_append_gbs = " \
+SRC_URI:append:gbs = " \
     file://gbs-host-s0-set-failsafe.service \
     file://gbs-host-s5-set-failsafe.service \
     file://gbs-host-set-boot-failsafe@.service \
@@ -11,11 +11,11 @@ SRC_URI_append_gbs = " \
     file://gbs-host-ready.target \
     "
 
-RDEPENDS_${PN}_append_gbs = "bash"
+RDEPENDS:${PN}:append:gbs = "bash"
 
 CHASSIS_INSTANCE="0"
 
-SYSTEMD_SERVICE_${PN}_append_gbs = " \
+SYSTEMD_SERVICE:${PN}:append:gbs = " \
     gbs-host-s0-set-failsafe.service \
     gbs-host-s5-set-failsafe.service \
     gbs-host-set-boot-failsafe@${CHASSIS_INSTANCE}.service \
@@ -23,11 +23,11 @@ SYSTEMD_SERVICE_${PN}_append_gbs = " \
     gbs-host-ready.target \
     "
 
-FILES_${PN}_append_gbs = " \
+FILES:${PN}:append:gbs = " \
     ${systemd_system_unitdir}/gbs-host-set-boot-failsafe@.service \
     "
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${bindir}
 
     install -m 0755 ${WORKDIR}/gbs-set-failsafe.sh ${D}${bindir}/.
diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend
index c2b5da404..85d0607f3 100644
--- a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/linux-nuvoton:"
-SRC_URI_append_gbs = " file://gbs.cfg"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/linux-nuvoton:"
+SRC_URI:append:gbs = " file://gbs.cfg"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb
index 167f78df9..c1f866f2d 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb
+++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb
@@ -25,11 +25,11 @@ do_install() {
         ${D}${datadir}/${BPN}/ipmi-inventory-sensors.yaml
 }
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
     ${datadir}/${BPN}/ipmi-fru-read.yaml \
     ${datadir}/${BPN}/ipmi-sensors.yaml \
     ${datadir}/${BPN}/ipmi-extra-properties.yaml \
     ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend
index 142661078..6f0774e96 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/files:"
 
-OBMC_CONSOLE_FRONT_TTY_gbs = "ttyS3"
-OBMC_CONSOLE_HOST_TTY_gbs = "ttyS1"
+OBMC_CONSOLE_FRONT_TTY:gbs = "ttyS3"
+OBMC_CONSOLE_HOST_TTY:gbs = "ttyS1"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index e617f8679..a68b4d61a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,17 +1,17 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://config.json.in \
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://config.json.in \
                        file://fan-table-init.sh \
                        file://phosphor-pid-control.service \
                      "
 
-FILES_${PN}_append_gbs = " ${datadir}/swampd/config.json.in"
-FILES_${PN}_append_gbs = " ${bindir}/fan-table-init.sh"
+FILES:${PN}:append:gbs = " ${datadir}/swampd/config.json.in"
+FILES:${PN}:append:gbs = " ${bindir}/fan-table-init.sh"
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-SYSTEMD_SERVICE_${PN}_append_gbs = " phosphor-pid-control.service"
+SYSTEMD_SERVICE:${PN}:append:gbs = " phosphor-pid-control.service"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}/${bindir}
     install -m 0755 ${WORKDIR}/fan-table-init.sh ${D}/${bindir}
 
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index f4ac6066d..edf81760f 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,34 +1,34 @@
 inherit obmc-phosphor-systemd
 
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
-SRC_URI_append_gbs = " file://phosphor-gpio-presence@.service.replace"
+SRC_URI:append:gbs = " file://phosphor-gpio-presence@.service.replace"
 
 TMPL_PRESENT = "phosphor-gpio-presence@.service"
 INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service"
 PRESENT_TGT = "multi-user.target"
 FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-0.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-1.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-2.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-3.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-4.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-5.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-6.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-7.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-8.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-9.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-10.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-11.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-0.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-1.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-2.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-3.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-4.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-5.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-6.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-7.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-8.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-9.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-10.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-11.conf"
 GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11"
 
-SYSTEMD_LINK_${PN}-presence_append_gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}"
+SYSTEMD_LINK_${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}"
 
 GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/phosphor-gpio-presence@.service.replace ${D}${systemd_system_unitdir}/phosphor-gpio-presence@.service
 }
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend
index ef3ecb2e4..6201ab558 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend
@@ -1,2 +1,2 @@
-SNOOP_DEVICE_gbs = "npcm7xx-lpc-bpc0"
-PACKAGECONFIG_append_gbs = " 7seg"
+SNOOP_DEVICE:gbs = "npcm7xx-lpc-bpc0"
+PACKAGECONFIG:append:gbs = " 7seg"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 2ed0fb7e9..494f9f4f6 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,45 +1,45 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-host-postd"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-sel-logger"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " google-ipmi-sys"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " google-ipmi-i2c"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-hotswap-power-cycle"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " loadsvf"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-cpld-ver-check"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " memtester"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " net-tools"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-boot-status-led"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-nvme"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-detect-gpio-present"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-ecc"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-sysinit"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-ipmi-entity-association-map"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " usb-network"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-image-signing"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " openssl-bin"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-ipmi-blobs-binarystore"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-virtual-sensor"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " acpi-power-state-daemon"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/obmc-gpio-presence"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ipmitool"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-health-monitor"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-host-postd"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-sel-logger"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " google-ipmi-sys"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " google-ipmi-i2c"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-hotswap-power-cycle"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " loadsvf"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-cpld-ver-check"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " memtester"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " net-tools"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-boot-status-led"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-nvme"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-detect-gpio-present"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-ecc"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-sysinit"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-ipmi-entity-association-map"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " usb-network"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-image-signing"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " openssl-bin"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-ipmi-blobs-binarystore"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-virtual-sensor"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " acpi-power-state-daemon"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual/obmc-gpio-presence"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ipmitool"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-health-monitor"
 
 # Add back packages that were part of packagegroup-obmc-apps-extras
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-hwmon"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-inventory-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-hwmon"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-inventory-manager"
 # Required for obmc-bmcweb
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " bmcweb"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-bmcweb-cert-config"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-nslcd-authority-cert-config"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-user-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " bmcweb"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-bmcweb-cert-config"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-nslcd-authority-cert-config"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-user-manager"
 # Required for LEDs. Part of obmc-leds
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
 # Required for the front port. Part of obmc-console
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " obmc-console"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " obmc-console"
 # Required from packagegroup-gbs-apps
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/bios-update"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " x86-power-control"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-pid-control"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual/bios-update"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " x86-power-control"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-pid-control"
 # Required for phosphor-ipmi-kcs
-OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual-obmc-host-ipmi-hw"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual-obmc-host-ipmi-hw"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 2c19a3ead..26856a728 100755
--- a/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,8 +1,8 @@
-EXTRA_OEMESON_append_gbs = " \
+EXTRA_OEMESON:append:gbs = " \
     -Dredfish-dbus-log=enabled \
     -Dhttp-body-limit=40 \
     "
 
-do_install_append_gbs(){
+do_install:append:gbs(){
     install -d ${D}${localstatedir}/lib/bmcweb
 }
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb b/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb
index 0c4b56f72..1b5a119b1 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb
+++ b/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-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-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 38825835d..8c15e4d8f 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append_gbs = " associations"
-SRC_URI_append_gbs = " file://associations.json"
-DEPENDS_append_gbs = " gbs-inventory-cleanup"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+PACKAGECONFIG:append:gbs = " associations"
+SRC_URI:append:gbs = " file://associations.json"
+DEPENDS:append:gbs = " gbs-inventory-cleanup"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${base_datadir}
     install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json
 }
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend
index 1dba2ec35..1e31ff184 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://config.json"
-FILES_${PN}_append_gbs = " ${datadir}/binaryblob/config.json"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://config.json"
+FILES:${PN}:append:gbs = " ${datadir}/binaryblob/config.json"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${datadir}/binaryblob/
     install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json
 }
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index ca7172498..308620f99 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
index 14f333b81..8744bef0b 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend
@@ -1,5 +1,5 @@
 NUVOTON_FLASH_PCIMBOX = "0xF0848000"
 
-PACKAGECONFIG_append_gbs = " nuvoton-p2a-mbox"
+PACKAGECONFIG:append:gbs = " nuvoton-p2a-mbox"
 
-IPMI_FLASH_BMC_ADDRESS_gbs = "${NUVOTON_FLASH_PCIMBOX}"
+IPMI_FLASH_BMC_ADDRESS:gbs = "${NUVOTON_FLASH_PCIMBOX}"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 877129716..f36178d35 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,7 +1,7 @@
 inherit obmc-phosphor-systemd
-DEPENDS_append_gbs = " gbs-yaml-config"
+DEPENDS:append:gbs = " gbs-yaml-config"
 
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
 EEPROM_NAMES = "motherboard hsbp fan"
 
@@ -11,16 +11,16 @@ 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_gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs := " ${@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_gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK_${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
 
-EXTRA_OECONF_append_gbs = " \
+EXTRA_OECONF:append:gbs = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-extra-properties.yaml \
     "
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 78fa57039..181527fca 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,14 +1,14 @@
-DEPENDS_append_gbs = " gbs-yaml-config"
+DEPENDS:append:gbs = " gbs-yaml-config"
 
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://gbs-ipmid-whitelist.conf"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://gbs-ipmid-whitelist.conf"
 
-WHITELIST_CONF_gbs = "${WORKDIR}/gbs-ipmid-whitelist.conf"
+WHITELIST_CONF:gbs = "${WORKDIR}/gbs-ipmid-whitelist.conf"
 
-EXTRA_OECONF_append_gbs = " \
+EXTRA_OECONF:append:gbs = " \
      SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-sensors.yaml \
      FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \
      INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-inventory-sensors.yaml \
      "
 
-RDEPENDS_${PN}_remove_gbs = "clear-once"
+RDEPENDS:${PN}:remove:gbs = "clear-once"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
index 34b6b790c..f832a4120 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
@@ -1 +1 @@
-KCS_DEVICE_gbs = "ipmi-kcs1"
+KCS_DEVICE:gbs = "ipmi-kcs1"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 30bf313cb..4e3ce61e9 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://service-override.conf"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://service-override.conf"
 
-FILES_${PN}_append_gbs = " ${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf"
+FILES:${PN}:append:gbs = " ${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     rm -rf ${D}${datadir}/${PN}/*
 
     install -d ${D}${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend
index 264423933..a77425ee5 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend
@@ -1 +1 @@
-EXTRA_OEMESON_append_gbs = " -Derror_info_cap=256"
+EXTRA_OEMESON:append:gbs = " -Derror_info_cap=256"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend
index 9caf61e66..195838d05 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,2 +1,2 @@
-PACKAGECONFIG_append_gbs = " nic-ethtool"
-PACKAGECONFIG_remove_gbs = "uboot-env"
+PACKAGECONFIG:append:gbs = " nic-ethtool"
+PACKAGECONFIG:remove:gbs = "uboot-env"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index 9bd1ffd04..009ea5070 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_gbs = " send-to-logger log-alarm"
+PACKAGECONFIG:append:gbs = " send-to-logger log-alarm"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 7307de7fa..657684d7a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
 DEPENDS += "boost"
 
@@ -19,15 +19,15 @@ GBS_NAMES = " \
 GBS_ITEMSFMT = "ahb/apb/{0}.conf"
 
 GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}"
-GBS_ITEMS_append_gbs += " iio-hwmon-battery.conf"
+GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf"
 
 ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}"
 
 # Fan sensors
 FITEMS = "pwm-fan-controller@103000.conf"
 FENVS = "obmc/hwmon/ahb/apb/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
 
 
-EXTRA_OEMESON_append_gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false"
+EXTRA_OEMESON:append:gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
index c3db11dad..974c6204d 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://nvme_config.json"
-SRC_URI_append_gbs = " file://nvme_json_rewrite.sh"
-SRC_URI_append_gbs = " file://xyz.openbmc_project.nvme.manager.service.replace"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://nvme_config.json"
+SRC_URI:append:gbs = " file://nvme_json_rewrite.sh"
+SRC_URI:append:gbs = " file://xyz.openbmc_project.nvme.manager.service.replace"
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
         install -d ${D}/${sysconfdir}/nvme/
         install -m 0644 ${WORKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme/
 
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index d151f2025..224a26235 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
-SRC_URI_append_gbs = " file://config-virtual-sensor.json \
+SRC_URI:append:gbs = " file://config-virtual-sensor.json \
                        file://phosphor-virtual-sensor.service.replace \
                      "
 
-RDEPENDS_${PN}_append_gbs = "bash"
+RDEPENDS:${PN}:append:gbs = "bash"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${datadir}/${PN}
     install -m 0644 -D ${WORKDIR}/config-virtual-sensor.json \
         ${D}${datadir}/${PN}/virtual_sensor_config.json
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 7e2056844..8bd8b22bf 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_append_gbs := ":${THISDIR}/${PN}"
-SRC_URI_append_gbs = " file://time-default.override.yml"
-SRC_URI_append_gbs = " file://restrictionmode-default-whitelist.override.yml"
+FILESEXTRAPATHS:append:gbs := ":${THISDIR}/${PN}"
+SRC_URI:append:gbs = " file://time-default.override.yml"
+SRC_URI:append:gbs = " file://restrictionmode-default-whitelist.override.yml"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index d8b1aa956..23b063fc3 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " obmc/watchdog/host0"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " obmc/watchdog/host0"
 OBMC_HOST_WATCHDOG_INSTANCES_A = "host0"
 WATCHDOG_FMT_A = "phosphor-watchdog@{0}.service"
-SYSTEMD_OVERRIDE_${PN}_remove_gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
-SYSTEMD_LINK_${PN}_remove_gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_LINK_${PN}_remove_gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_SERVICE_${PN}_gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \
+SYSTEMD_OVERRIDE_${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
+SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_SERVICE:${PN}:gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \
                               phosphor-host-watchdog-reset.service \
                               phosphor-host-watchdog-poweroff.service \
                               phosphor-host-watchdog-powercycle.service \
diff --git a/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend b/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend
index b6439a158..8cd6e594b 100644
--- a/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend
+++ b/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://00-bmc-usb0.network"
-SRC_URI_append_gbs = " file://usb-network.conf"
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://00-bmc-usb0.network"
+SRC_URI:append:gbs = " file://usb-network.conf"
 
-FILES_${PN}_append_gbs = " ${datadir}/usb-network/usb-network.conf"
-FILES_${PN}_append_gbs = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+FILES:${PN}:append:gbs = " ${datadir}/usb-network/usb-network.conf"
+FILES:${PN}:append:gbs = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${sysconfdir_native}/systemd/network/
     install -m 0644 ${WORKDIR}/00-bmc-usb0.network \
         ${D}${sysconfdir_native}/systemd/network
diff --git a/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend
index 33cc6d4e0..348ad1043 100644
--- a/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-SRC_URI_append_gbs = " file://power-config-host0.json \
+FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
+SRC_URI:append:gbs = " file://power-config-host0.json \
                        file://chassis-system-reset.service \
                      "
 
-EXTRA_OECMAKE_append_gbs = " -DCHASSIS_SYSTEM_RESET=ON"
+EXTRA_OECMAKE:append:gbs = " -DCHASSIS_SYSTEM_RESET=ON"
 
-RDEPENDS_${PN}_append_gbs = " bash"
-RDEPENDS_${PN}_append_gbs = " gbs-hotswap-power-cycle"
+RDEPENDS:${PN}:append:gbs = " bash"
+RDEPENDS:${PN}:append:gbs = " gbs-hotswap-power-cycle"
 
-do_install_append_gbs() {
+do_install:append:gbs() {
     install -d ${D}${datadir}/${PN}
     install -m 0644 ${WORKDIR}/power-config-host0.json ${D}${datadir}/${PN}
 }