Convert to new override syntax

This is effectively a manual cherry-pick of commit:

37d3b1b316470fdcfebc59d5522bfbfefc025ff6

from the master branch with additional review and fixups.

The intent of these changes is to minimize the effort to backport
fixes from the master branch, which has been updated in preparation
for the switch to the next Yocto LTS release in early 2022.

Bug-AGL: SPEC-4144

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7

77 files changed, 136 insertions, 136 deletions

diff --git a/meta-agl-drm-lease/README.md b/meta-agl-drm-lease/README.md
index 2c5ba05d..b572fbce 100644
--- a/meta-agl-drm-lease/README.md
+++ b/meta-agl-drm-lease/README.md
@@ -22,7 +22,7 @@ lease support to the following packages:
 image, add the following to your local.conf
 
 ```
-IMAGE_INSTALL_append = " kmscube"
+IMAGE_INSTALL:append = " kmscube"
 ```
 
 ## Starting the DRM lease manager
diff --git a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
index e0a434c3..4e48edfd 100644
--- a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
+++ b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
@@ -1,7 +1,7 @@
 COMPATIBLE_MACHINE = "rcar-gen3"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch \
     file://0002-drm-rcar-du-support-render-node.patch \
 "
diff --git a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
index 4fcb7852..6a79ec2e 100644
--- a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
+++ b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
@@ -17,16 +17,16 @@ inherit ptest
 
 DEPENDS = "libdrm libcheck fff"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/drm-lease-manager.service ${D}/${systemd_unitdir}/system
     rm -rf ${D}/${localstatedir}
 }
 
-SYSTEMD_SERVICE_${PN} = "drm-lease-manager.service"
+SYSTEMD_SERVICE:${PN} = "drm-lease-manager.service"
 
 EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Denable-tests=true', '', d)}"
-RDEPENDS_${PN}-ptest = "libcheck"
+RDEPENDS:${PN}-ptest = "libcheck"
 
 do_install_ptest() {
     install ${B}/libdlmclient/test/libdlmclient-test ${D}${PTEST_PATH}
@@ -35,4 +35,4 @@ do_install_ptest() {
 }
 
 PACKAGES =+ "libdlmclient"
-FILES_libdlmclient = "${libdir}/libdlmclient${SOLIBS}"
+FILES:libdlmclient = "${libdir}/libdlmclient${SOLIBS}"
diff --git a/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend b/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
index fb4f9972..bc9e8b34 100644
--- a/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
+++ b/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 
 SRC_URI += "file://0001-texturator-Use-correct-GL-extension-header.patch \
diff --git a/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend b/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
index b3d63db0..9e4630d8 100644
--- a/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
+++ b/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
             file://0001-backend-drm-Add-method-to-import-DRM-fd.patch \
             file://0002-Add-DRM-lease-support.patch \
             file://0003-launcher-do-not-touch-VT-tty-while-using-non-default.patch \
@@ -9,4 +9,4 @@ SRC_URI_append = " \
             "
 
 PACKAGECONFIG[drm-lease] = "-Ddrm-lease=true,-Ddrm-lease=false,drm-lease-manager"
-PACKAGECONFIG_append = " drm-lease"
+PACKAGECONFIG:append = " drm-lease"
diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
index 687980cf..ce7b0227 100644
--- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
+++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -1,5 +1,5 @@
 
-do_deploy_append_raspberrypi4() {
+do_deploy:append:raspberrypi4() {
     # if ARMSTUB is set, it should be set in config.txt by earlier recipes, so replace it
     if [ -n "${ARMSTUB}" ]; then
         sed -i 's/^armstub=.*/armstub=bl31.bin/' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 158eb6e8..e84d2409 100644
--- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -6,7 +6,7 @@ TFA_PLATFORM = "rpi4"
 # partition that is generated from the files in DEPLOYDIR
 do_install[noexec] = "1"
 
-FILES_${PN} = ""
+FILES:${PN} = ""
 
 do_deploy() {
     if ${@"true" if d.getVar('TFA_DEBUG') == '1' else "false"}; then
diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend
index 1d8ea6b7..b1f29275 100644
--- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend
+++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-extended/jailhouse/jailhouse_%.bbappend
@@ -1,2 +1,2 @@
-DEPENDS_append_raspberrypi4 = " trusted-firmware-a"
+DEPENDS:append:raspberrypi4 = " trusted-firmware-a"
 
diff --git a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend
index 1456fdc8..ba3505fe 100644
--- a/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend
+++ b/meta-agl-jailhouse/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-dt-dtoverlays-Add-jailhouse-memory-DT-overlay.patch"
 
diff --git a/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb b/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
index 2a7e37ed..2b6f4a65 100644
--- a/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
+++ b/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
 SRCREV = "4ce7658dddfd5a1682a379d5ac46657e93fe1ff0"
 PV = "0.12+git${SRCPV}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI = "git://github.com/siemens/jailhouse;branch=master;protocol=https \
            file://0001-configs-arm64-Add-support-for-RPi4-with-more-than-1G.patch \
@@ -84,15 +84,15 @@ do_install() {
 }
 
 PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools ${PN}-demos"
-FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
-FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
-FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-* ${JH_DATADIR}/*.tmpl"
-FILES_${PN}-demos = "${JH_DATADIR}/ ${sbindir}/ivshmem-demo"
+FILES:${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
+FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
+FILES:${PN}-tools = "${libexecdir}/${BPN}/${BPN}-* ${JH_DATADIR}/*.tmpl"
+FILES:${PN}-demos = "${JH_DATADIR}/ ${sbindir}/ivshmem-demo"
 
-RDEPENDS_${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression python3-mako"
-RDEPENDS_pyjailhouse = "python3-core python3-ctypes python3-fcntl"
-RDEPENDS_${PN}-demos = "jailhouse"
+RDEPENDS:${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression python3-mako"
+RDEPENDS:pyjailhouse = "python3-core python3-ctypes python3-fcntl"
+RDEPENDS:${PN}-demos = "jailhouse"
 
-RRECOMMENDS_${PN} = "${PN}-tools"
+RRECOMMENDS:${PN} = "${PN}-tools"
 
 KERNEL_MODULE_AUTOLOAD += "jailhouse"
diff --git a/meta-agl-jailhouse/recipes-kernel/linux/linux-jailhouse-5.4.inc b/meta-agl-jailhouse/recipes-kernel/linux/linux-jailhouse-5.4.inc
index 4b571ffd..4b810182 100644
--- a/meta-agl-jailhouse/recipes-kernel/linux/linux-jailhouse-5.4.inc
+++ b/meta-agl-jailhouse/recipes-kernel/linux/linux-jailhouse-5.4.inc
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
 
-SRC_URI_append = " file://jailhouse.cfg"
+SRC_URI:append = " file://jailhouse.cfg"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
 file://0001-x86-jailhouse-Improve-setup-data-version-comparison.patch \
 file://0002-x86-jailhouse-Only-enable-platform-UARTs-if-availabl.patch \
 file://0003-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch \
diff --git a/meta-agl-lxc/classes/guest-kernel-module.bbclass b/meta-agl-lxc/classes/guest-kernel-module.bbclass
index bbe25c20..6c8da4a2 100644
--- a/meta-agl-lxc/classes/guest-kernel-module.bbclass
+++ b/meta-agl-lxc/classes/guest-kernel-module.bbclass
@@ -18,4 +18,4 @@ do_install:aglcontainerguest() {
 
 # Guest doesn't build the module, so go ahead and quiet warnings about
 # double '/' in base recipe definition
-FILES_${PN}:aglcontainerguest = ""
+FILES:${PN}:aglcontainerguest = ""
diff --git a/meta-agl-lxc/classes/lxc-config.bbclass b/meta-agl-lxc/classes/lxc-config.bbclass
index 1aefccdc..a3bdf802 100644
--- a/meta-agl-lxc/classes/lxc-config.bbclass
+++ b/meta-agl-lxc/classes/lxc-config.bbclass
@@ -29,7 +29,7 @@ inherit allarch
 
 DRM_LEASE_DEVICE ??= "card0-HDMI-A-1"
 
-DRM_LEASE_DEVICE_qemuall ?= "card0-Virtual-1"
+DRM_LEASE_DEVICE:qemuall ?= "card0-Virtual-1"
 
 LXC_AUTO_START ??= "0"
 
@@ -45,4 +45,4 @@ do_install () {
     done
 }
 
-FILES_${PN} = "${localstatedir}/lib/lxc/"
+FILES:${PN} = "${localstatedir}/lib/lxc/"
diff --git a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
index 1e2e932d..db25b3b7 100644
--- a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
+++ b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf
@@ -1,23 +1,23 @@
-OVERRIDES_append = ":aglcontainerguest"
+OVERRIDES:append = ":aglcontainerguest"
 
 TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}"
 
 # Can be blank as container image type results in a .tar.bz2
-AGL_DEFAULT_IMAGE_FSTYPES_aglcontainerguest = ""
-AGL_EXTRA_IMAGE_FSTYPES_aglcontainerguest = ""
+AGL_DEFAULT_IMAGE_FSTYPES:aglcontainerguest = ""
+AGL_EXTRA_IMAGE_FSTYPES:aglcontainerguest = ""
 
-IMAGE_FSTYPES_aglcontainerguest = "container"
+IMAGE_FSTYPES:aglcontainerguest = "container"
 
-IMAGE_LINGUAS_append_aglcontainerguest = " en-us"
+IMAGE_LINGUAS:append:aglcontainerguest = " en-us"
 
-PREFERRED_PROVIDER_virtual/kernel_aglcontainerguest = "linux-dummy"
-KERNEL_DEVICETREE_aglcontainerguest = ""
+PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy"
+KERNEL_DEVICETREE:aglcontainerguest = ""
 
 # Disable serial consoles
-SERIAL_CONSOLES_aglcontainerguest = ""
+SERIAL_CONSOLES:aglcontainerguest = ""
 
 # Remove unneeded firmware packages
-EXTRA_IMAGEDEPENDS_remove_aglcontainerguest = "arm-trusted-firmware optee-os u-boot"
+EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot"
 
 # We assume rngd is running on the host, so unnecessary in container
 VIRTUAL-RUNTIME_rngd = ""
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend
index e30136f2..6060e6b1 100644
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend
@@ -1,4 +1,4 @@
 # Add a hook to disable depending on cryptodev-module for containers
 CRYPTODEV_RDEPENDS = "cryptodev-module"
-CRYPTODEV_RDEPENDS_aglcontainerguest = ""
+CRYPTODEV_RDEPENDS:aglcontainerguest = ""
 PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
index 41cdea3b..c942f687 100644
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN}_remove_aglcontainerguest = "kernel-module-gles"
+RDEPENDS:${PN}:remove:aglcontainerguest = "kernel-module-gles"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
index f41a0ec4..057613fb 100644
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
@@ -6,4 +6,4 @@ do_install:aglcontainerguest:append() {
 }
 
 PACKAGES:append:aglcontainerguest = " ${PN}-dev"
-FILES_${PN}-dev:aglcontainerguest += "${includedir}"
+FILES:${PN}-dev:aglcontainerguest += "${includedir}"
diff --git a/meta-agl-lxc/recipes-container/lxc/lxc_4.%.bbappend b/meta-agl-lxc/recipes-container/lxc/lxc_4.%.bbappend
index 61dfa665..72078495 100644
--- a/meta-agl-lxc/recipes-container/lxc/lxc_4.%.bbappend
+++ b/meta-agl-lxc/recipes-container/lxc/lxc_4.%.bbappend
@@ -1,11 +1,11 @@
-PACKAGECONFIG_remove = "templates"
+PACKAGECONFIG:remove = "templates"
 
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 # NOTE:
 # This needs to be replaced with a rework of the upstream packaging
 # to do a proper split of core from the template support.
-RDEPENDS_${PN} = ""
+RDEPENDS:${PN} = ""
 
 
 
diff --git a/meta-agl-lxc/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-agl-lxc/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
index 892ac7b1..13f85b59 100644
--- a/meta-agl-lxc/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
+++ b/meta-agl-lxc/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
@@ -1,8 +1,8 @@
 # Disable LTTng dependencies when building for container guest to avoid
 # lttng-modules being pulled in as a dependency.
-LTTNGUST_aglcontainerguest = ""
-LTTNGTOOLS_aglcontainerguest = ""
-LTTNGMODULES_aglcontainerguest = ""
+LTTNGUST:aglcontainerguest = ""
+LTTNGTOOLS:aglcontainerguest = ""
+LTTNGMODULES:aglcontainerguest = ""
 
 # Similarly, disable perf since it builds out of the kernel source tree.
-PERF_aglcontainerguest = ""
+PERF:aglcontainerguest = ""
diff --git a/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb b/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb
index 0edf7890..9d758dce 100644
--- a/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb
+++ b/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb
@@ -24,16 +24,16 @@ inherit cmake cmake_qt5 systemd
 APP_DIR = "/opt/apps"
 EXTRA_OECMAKE = "-DAPPS_INST_DIR=${APP_DIR}"
 
-SYSTEMD_SERVICE_${PN} = "cluster.service"
+SYSTEMD_SERVICE:${PN} = "cluster.service"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
 }
 
-FILES_${PN} += "${APP_DIR}/"
+FILES:${PN} += "${APP_DIR}/"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     qtbase \
     qtdeclarative \
     qt3d \
diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf.bbappend
index 00057874..46dfc124 100644
--- a/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-lxc/recipes-graphics/wayland/weston-init.bbappend
index 9951b2b3..4374c455 100644
--- a/meta-agl-lxc/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-agl-lxc/recipes-graphics/wayland/weston-init.bbappend
@@ -1,18 +1,18 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 AGL_DEFAULT_WESTONSTART ??= "/usr/bin/weston --config ${sysconfdir}/xdg/weston/weston.ini"
 WESTONARGS ?= "--idle-time=0 --drm-lease=\${DRM_LEASE_DEVICE}"
 
 WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}"
-WESTONSTART_append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", " --debug", "",d)}"
+WESTONSTART:append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", " --debug", "",d)}"
 
 WIFILES = " \
     file://drm-lease.conf.in \
 "
 
-SRC_URI_append = " ${WIFILES}"
+SRC_URI:append = " ${WIFILES}"
 
-do_install_append() {
+do_install:append() {
     # Process ".in" files
     files=$(echo ${WIFILES} | sed s,file://,,g)
     for f in ${files}; do
@@ -35,6 +35,6 @@ do_install_append() {
     ln -s ../weston@.service ${D}${systemd_system_unitdir}/multi-user.target.wants/weston@root.service
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${systemd_system_unitdir}/ \
 "
diff --git a/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc b/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc
index f123f6d9..327beb18 100644
--- a/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc
+++ b/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
 
 # Disable all other AGL provided kernel configuration (barring
 # base BSP provided configuration), and just enable a locally
diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb b/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb
index 7b6af7ee..82fcf4fe 100644
--- a/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb
+++ b/meta-agl-lxc/recipes-platform/images/guest-image-minimal.bb
@@ -4,4 +4,4 @@ require recipes-platform/images/agl-image-boot.inc
 
 IMAGE_LINGUAS = " "
 
-IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
+IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
diff --git a/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb b/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb
index 1af163b8..f4d263e9 100644
--- a/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb
+++ b/meta-agl-lxc/recipes-platform/images/lxc-host-image-demo.bb
@@ -11,4 +11,4 @@ IMAGE_INSTALL += " \
     ${@bb.utils.contains('AGL_FEATURES', 'agl-drm-lease', 'drm-lease-manager', '', d)} \
 "
 
-IMAGE_INSTALL_append_rcar-gen3 = " kernel-module-gles "
+IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles "
diff --git a/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb b/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
index 11eb513b..912d868a 100644
--- a/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
+++ b/meta-agl-lxc/recipes-platform/images/lxc-host-image-minimal.bb
@@ -56,5 +56,5 @@ do_rootfs[nostamp] = "1"
 
 ROOTFS_POSTPROCESS_COMMAND += "install_container_images; "
 
-IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
+IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
index fa6211b5..c27cbd45 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
+++ b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
@@ -1,3 +1,3 @@
 inherit bsmake
 
-DEPENDS_append = " agl-basefiles"
+DEPENDS:append = " agl-basefiles"
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
index 0a0f4da0..a84ed706 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
@@ -23,7 +23,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     libnv-hal \
     ns-backupmanager \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
index acd1f9dc..ee174dad 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-posixbasedos001legacylibrary \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
index 4befbf7e..12261753 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
@@ -22,7 +22,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ps-communication \
     os-posixbasedos001legacylibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
index b6d69381..6d402f50 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
@@ -29,7 +29,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-config \
     ss-interfaceunified \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
index 68417d9a..742eec88 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-romaccesslibrary \
     ns-frameworkunified \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
index 508d0f7c..fb658eae 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
@@ -24,11 +24,11 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-do_compile_prepend() {
+do_compile:prepend() {
     oe_runmake -f Makefile.client
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-resourcemanager \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
index 9ca00350..a62ed6e8 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
@@ -33,9 +33,9 @@ inherit agl-basesystem-common perlnative
 
 BSMAKE_FILE = "Makefile.server"
 
-FILES_${PN} += "/usr/share/*"
+FILES:${PN} += "/usr/share/*"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-ss-resourcemanager \
     agl-service-ss-loggerservice \
     agl-service-ps-communication \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
index e950ed42..710dee91 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
@@ -28,11 +28,11 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-do_compile_prepend() {
+do_compile:prepend() {
     oe_runmake -f Makefile.client
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-resourcemanager \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
index 02fe1565..4d4cf047 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
@@ -31,7 +31,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-config \
     ss-interfaceunified \
     ss-versionlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
index 27b2cae0..fd40a394 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
@@ -17,11 +17,11 @@ do_install() {
     install -m 644 -D ${S}/include/* ${D}${includedir}/basesystem/
 }
 
-do_install_class-native() {
+do_install:class-native() {
     install -d ${D}${bindir}
     install -m 755 -D ${S}/bin/launch_xml2cfg.sh ${D}${bindir}/
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
index 4de2b702..a918ee0b 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
@@ -29,9 +29,9 @@ do_install() {
     install -m 644 ${S}/99-basesystem.rules ${D}/lib/udev/rules.d/
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     launch_sm.service \
     systemd-udev-trigger.service \
     setup_refhw.service \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
index 2d88fca3..b8e34099 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.library"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     os-posixbasedos001legacylibrary \
     ns-loglibrary \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
index 5017e615..d0c5bf06 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     os-posixbasedos001legacylibrary \
     ns-loglibrary \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
index bbd743a7..423190b3 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
@@ -22,7 +22,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-romaccesslibrary \
     ns-frameworkunified \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
index ea0c0725..657a3405 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
@@ -23,7 +23,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ss-interfaceunified \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
index 279995f9..18f0ab1e 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
@@ -26,7 +26,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ns-frameworkunified \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
index 38e3aaf8..472e90bf 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-vehicleparameterlibrary \
     vs-positioningbaselibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
index 3f7af7ad..b28c0178 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/Path-Tiny-${PV}"
 
 inherit cpan ptest-perl
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     perl-module-file-spec \
     perl-module-file-temp \
     perl-module-test-more \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
index d81f18ff..72780a67 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/Scalar-List-Utils-${PV}"
 
 inherit cpan ptest-perl
 
-do_install_prepend() {
+do_install:prepend() {
     # requires "-T" (taint) command line option
     rm -rf ${B}/t/tainted.t
 }
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
index 3f130550..3049ceda 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/XML-XPath-${PV}"
 
 inherit cpan ptest-perl
 
-do_install_append_class-native() {
+do_install:append:class-native() {
     # Fix xpath script shebang to work inside native environment
     sed -i 's|#!.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/xpath
 }
@@ -24,7 +24,7 @@ do_install_ptest() {
     install -m 0644 ${S}/examples/test.xml ${D}${PTEST_PATH}/examples/
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     perl-module-carp \
     perl-module-data-dumper \
     perl-module-file-spec \
@@ -38,7 +38,7 @@ RDEPENDS_${PN} += " \
     libscalar-list-utils-perl \
 "
 
-RDEPENDS_${PN}-ptest += " \
+RDEPENDS:${PN}-ptest += " \
     libpath-tiny-perl \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
index 078f157d..2c185800 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
@@ -17,7 +17,7 @@ do_install() {
     install -m 644 -D ${S}/agldd/* ${D}${includedir}/basesystem/agldd/
 }
 
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
     ${includedir}/basesystem/agldd/* \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
index f474e548..9ab15907 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
@@ -16,7 +16,7 @@ inherit module
 
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
-RPROVIDES_${PN} += " \
+RPROVIDES:${PN} += " \
     kernel-module-evk_lib \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
index 98cf1438..ffb501e2 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
@@ -6,7 +6,7 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-agl-basesystem-apis \
 "
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-ns-backupmanager \
     agl-service-ns-notificationpersistent \
     agl-service-ps-communication \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
index 1f39fe4b..b4af51e4 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
@@ -6,6 +6,6 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-agl-basesystem-core \
 "
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     agl-systemd \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
index 8e69ae9e..5f84b63b 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
@@ -6,7 +6,7 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-bshalmake \
 "
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     libboot-hal \
     libcan-hal \
     libclock-hal \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
index 2e5c9cf7..128f9dd6 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
@@ -7,7 +7,7 @@ PACKAGES = "\
     packagegroup-agl-basesystem-service \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-commonlibrary \
     ns-frameworkunified \
     ns-loglibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
index 85614c03..149f4aca 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
@@ -7,13 +7,13 @@ PACKAGES = "\
     packagegroup-agl-basesystem \
 "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-image-minimal \
 "
 
-RDEPENDS_${PN}  += "\
+RDEPENDS:${PN}  += "\
     packagegroup-agl-basesystem-core \
     packagegroup-agl-basesystem-apis \
     packagegroup-agl-basesystem-service \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
index 13e3605f..3724f894 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     libnv-hal \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
index a4aa6302..5332eb38 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
@@ -17,6 +17,6 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     kernel-module-evklib \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
index 573207ac..6db3ef90 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
@@ -14,7 +14,7 @@ SRCREV := "${BASESYSTEM_REVISION}"
 
 S = "${WORKDIR}/git/service/other/rpc_library/tool"
 
-do_compile_prepend () {
+do_compile:prepend () {
     oe_runmake clean
 }
 
@@ -22,7 +22,7 @@ do_install () {
     install -D -m 755 ${S}/rpc_apidef ${D}${bindir}/rpc_apidef
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${bindir}/rpc_apidef \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
index b39930b6..50c84831 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-commonlibrary \
     ns-loglibrary \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
index e5ed88d5..4c8ff27a 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
@@ -15,6 +15,6 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-backupmanager \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
index 08625095..7eb17412 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
@@ -18,7 +18,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ps-communicationsubcpu \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
index 6366ea8e..ed880d25 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
@@ -22,7 +22,7 @@ BSMAKE_FILE = "Makefile.client"
 
 DIRFILES = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-commonlibrary \
     ns-frameworkunified \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
index dc9b1df0..42dcf22e 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ns-commonlibrary \
     ns-memorygpioaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
index 7ff32db7..42bb3bc5 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ss-interfaceunified \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
index d77d028a..30cb3fd6 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-eventlibrary \
     os-vehicleparameterlibrary \
diff --git a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
index c8e61852..10f08301 100644
--- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
+++ b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
@@ -12,6 +12,6 @@ BBMASK += "meta-aac/recipes-multimedia/libopus"
 
 PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config"
 
-FEATURE_PACKAGES_agl-voiceagent-alexa = "packagegroup-agl-voiceagent-alexa"
+FEATURE_PACKAGES:agl-voiceagent-alexa = "packagegroup-agl-voiceagent-alexa"
 
 AGL_FEATURES += "agl-voiceagent-alexa"
diff --git a/meta-speech-framework/meta-aac-amazonlite/recipes-wakeword/pryon-lite/pryon-lite.bbappend b/meta-speech-framework/meta-aac-amazonlite/recipes-wakeword/pryon-lite/pryon-lite.bbappend
index ceba2eb2..288b652e 100644
--- a/meta-speech-framework/meta-aac-amazonlite/recipes-wakeword/pryon-lite/pryon-lite.bbappend
+++ b/meta-speech-framework/meta-aac-amazonlite/recipes-wakeword/pryon-lite/pryon-lite.bbappend
@@ -1,2 +1,2 @@
 # Required to avoid QA errors from the prebuilt libraries
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP:${PN} += "ldflags"
diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb
index 736a7ce5..6b0203a9 100644
--- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb
+++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voice-high-config_1.0.bb
@@ -16,5 +16,5 @@ do_install () {
     install -D -m 644 ${WORKDIR}/voice-high.json ${D}${sysconfdir}/xdg/AGL/voice-high.json
 }
 
-RPROVIDES_${PN} += "virtual/voice-high-config"
+RPROVIDES:${PN} += "virtual/voice-high-config"
 
diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb
index a16ad182..13d259b8 100644
--- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb
+++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-config_1.0.bb
@@ -48,4 +48,4 @@ do_install () {
     install -D -m 644 ${WORKDIR}/AlexaAutoCoreEngineConfig.json ${D}${sysconfdir}/xdg/AGL/AlexaAutoCoreEngineConfig.json
 }
 
-RPROVIDES_${PN} += "virtual/alexa-voiceagent-config"
+RPROVIDES:${PN} += "virtual/alexa-voiceagent-config"
diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
index 580b141c..c08377cd 100644
--- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
+++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
@@ -38,17 +38,17 @@ EXTRA_OECMAKE += "-DAAC_HOME=${RECIPE_SYSROOT}/${AAC_PREFIX}"
 
 ALEXA_WAKEWORD ??= "false"
 
-do_install_append() {
+do_install:append() {
     install -D -m 0644 ${WORKDIR}/alexa.json ${D}${sysconfdir}/xdg/AGL/voiceagents/alexa.json
 }
 
 PACKAGES =+ "${PN}-conf"
 
-FILES_${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*"
+FILES:${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*"
 
 # NOTE: curl and opus are from the base SDK libraries, sqlite3 from the
 #       core module
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
 	libcurl \
 	libopus \
 	libsqlite3 \
diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend
index d4ea2592..3b1bc32c 100644
--- a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend
+++ b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://0001-connection-deadlock-workaround.patch"
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend
index 93b7b443..a4a0c57b 100644
--- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend
+++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend
@@ -1,3 +1,3 @@
 # Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe
-DEPENDS_remove = "nlohmann"
-DEPENDS_append = " nlohmann-json"
+DEPENDS:remove = "nlohmann"
+DEPENDS:append = " nlohmann-json"
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend
index 93b7b443..a4a0c57b 100644
--- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend
+++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend
@@ -1,3 +1,3 @@
 # Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe
-DEPENDS_remove = "nlohmann"
-DEPENDS_append = " nlohmann-json"
+DEPENDS:remove = "nlohmann"
+DEPENDS:append = " nlohmann-json"
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend
index 94e9f94b..7417b494 100644
--- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend
+++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # Needed for the required gstreamer-app-1.0 pkgconfig bits
 DEPENDS += "gstreamer1.0-plugins-base"
@@ -9,4 +9,4 @@ AAC_PATCHES += "file://0001-update-pipewire-gstreamer-plugins.patch"
 EXTRA_OECMAKE += "-DUSE_PIPEWIRE=1"
 
 # Pull static library into appropriate package to avoid a QA error
-FILES_${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a"
+FILES:${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a"
diff --git a/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb b/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
index 4b4016af..12f51604 100644
--- a/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
+++ b/meta-speech-framework/meta-aac/recipes-platform/packagegroups/packagegroup-agl-voiceagent-alexa.bb
@@ -9,6 +9,6 @@ PACKAGES = "\
     packagegroup-agl-voiceagent-alexa \
     "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     alexa-voiceagent-service \
     "
diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc
index 081c53fb..0acefaa3 100644
--- a/templates/feature/agl-jailhouse/50_local.conf.inc
+++ b/templates/feature/agl-jailhouse/50_local.conf.inc
@@ -1,20 +1,20 @@
 #### JAILHOUSE 
-IMAGE_INSTALL_append = " jailhouse jailhouse-demos"
+IMAGE_INSTALL:append = " jailhouse jailhouse-demos"
 PREFERRED_VERSION_linux-raspberrypi = "5.4%"
 
-RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/jailhouse-memory.dtbo"
+RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/jailhouse-memory.dtbo"
 
 #Qemu Boot Config
 # qemu flags for jailhouse
-QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex"
+QB_OPT_APPEND:append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex"
 QB_MEM = "-m 1G"
 
 # use override with higher priority than x86-64
-QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
-QB_CPU_qemux86-64 = "-enable-kvm"
-QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor"
+QB_MACHINE:qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4"
+QB_CPU:qemux86-64 = "-enable-kvm"
+QB_CPU_KVM:qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor"
 
-QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M$0x22000000"
+QB_KERNEL_CMDLINE_APPEND:append = " intel_iommu=off memmap=82M$0x22000000"
 
 QB_KERNEL_ROOT = "/dev/vda"
 QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait"
diff --git a/templates/feature/agl-lxc/50_local.conf.inc b/templates/feature/agl-lxc/50_local.conf.inc
index 6f337415..964376de 100644
--- a/templates/feature/agl-lxc/50_local.conf.inc
+++ b/templates/feature/agl-lxc/50_local.conf.inc
@@ -3,5 +3,5 @@ BBMULTICONFIG = "agl-container-guest"
 # Disable the meta-virtualization configuration support enabled by
 # agl-virt.  This should be revisited when upgrading past dunfell,
 # as less of the extra configuration may be enabled in the future.
-DISTRO_FEATURES_remove = "virtualization"
-INHERIT_remove = "sanity-meta-virt"
+DISTRO_FEATURES:remove = "virtualization"
+INHERIT:remove = "sanity-meta-virt"
diff --git a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc
index ab41cdbd..088268ab 100644
--- a/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc
+++ b/templates/feature/agl-voiceagent-alexa/50_bblayers.conf.inc
@@ -12,4 +12,4 @@ BBFILES += "${METADIR}/external/alexa-auto-sdk/extensions/experimental/system-au
 
 # For now, tweak the layer's compatibility to allow using with zeus,
 # since we know it works without major issues.
-LAYERSERIES_COMPAT_aac_append = " dunfell"
\ No newline at end of file
+LAYERSERIES_COMPAT_aac:append = " dunfell"
\ No newline at end of file