meta-arm: Convert to new override syntax

Signed-off-by: Jon Mason <jon.mason@arm.com>

ci/base.yml

@@ -29,14 +29,14 @@ local_conf_header:
     CONF_VERSION = "2"
     PACKAGE_CLASSES = "package_ipk"
     LICENSE_FLAGS_WHITELIST += "armcompiler"
-    PACKAGECONFIG_remove_pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+    PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
     BB_NUMBER_THREADS = "16"
     PARALLEL_MAKE = "-j16"
     INHERIT += "rm_work"
-    PACKAGECONFIG_append_pn-perf = " coresight"
+    PACKAGECONFIG:append:pn-perf = " coresight"
   noptest: |
-    DISTRO_FEATURES_remove = "ptest"
+    DISTRO_FEATURES:remove = "ptest"
 
 machine: unset
 

ci/gem5-arm64-xen.yml

@@ -22,7 +22,7 @@ machine: gem5-arm64
 
 local_conf_header:
   meta-virt:
-    DISTRO_FEATURES_append = " virtualization xen"
+    DISTRO_FEATURES:append = " virtualization xen"
 
 target:
   - xen-image-minimal

ci/qemuarmv5.yml

@@ -8,4 +8,4 @@ machine: qemuarmv5
 local_conf_header:
   bugs: |
     # Remove parselogs until errors can be resolved
-    TEST_SUITES_remove = "parselogs"
+    TEST_SUITES:remove = "parselogs"

ci/testimage.yml

@@ -10,7 +10,7 @@ local_conf_header:
     TEST_SERVER_IP = "127.0.0.1"
     QEMU_USE_SLIRP = "1"
   packages: |
-    IMAGE_FEATURES_append = " ssh-server-dropbear"
+    IMAGE_FEATURES:append = " ssh-server-dropbear"
 
 # Multiple targets are available, put it down to just one
 target:

kas/fvp-baser-aemv8r64-bsp.yml

@@ -29,10 +29,10 @@ local_conf_header:
   base: |
     CONF_VERSION = "2"
     PACKAGE_CLASSES = "package_ipk"
-    PACKAGECONFIG_remove_pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
-    IMAGE_CLASSES_append = " ${@oe.utils.ifelse(d.getVar('FVP_BASE_R_AEM_TARBALL_URI'), 'fvpboot', '')}"
-    LICENSE_FLAGS_WHITELIST_append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}"
+    PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
+    IMAGE_CLASSES:append = " ${@oe.utils.ifelse(d.getVar('FVP_BASE_R_AEM_TARBALL_URI'), 'fvpboot', '')}"
+    LICENSE_FLAGS_WHITELIST:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}"
 
 target:
   - core-image-minimal

meta-arm-autonomy/classes/alternate-kernel.bbclass

@@ -2,7 +2,7 @@
 # an alternate kernel (set via PREFERRED_PROVIDER_alternate/kernel).
 #
 # It is mandatory to also set the KERNEL_PACKAGE_NAME for the alternate kernel
-# recipe via KERNEL_PACKAGE_NAME_pn-${PREFERRED_PROVIDER_alternate/kernel} and
+# recipe via KERNEL_PACKAGE_NAME:pn-${PREFERRED_PROVIDER_alternate/kernel} and
 # its value needs to be different from "kernel" since this is the default set
 # for PREFERRED_PROVIDER_virtual/kernel.
 #
@@ -16,11 +16,11 @@ PREFERRED_PROVIDER_alternate/kernel ??= ""
 python () {
     alternate_kernel = d.getVar('PREFERRED_PROVIDER_alternate/kernel')
     if alternate_kernel:
-        alternate_kernel_pkg_name = d.getVar('KERNEL_PACKAGE_NAME_pn-%s' % alternate_kernel)
+        alternate_kernel_pkg_name = d.getVar('KERNEL_PACKAGE_NAME:pn-%s' % alternate_kernel)
         if alternate_kernel_pkg_name:
             d.appendVar('EXTRA_IMAGEDEPENDS', ' ' + alternate_kernel)
             d.appendVar('IMAGE_INSTALL', ' kernel-modules')
             d.appendVar('IMAGE_INSTALL', ' ' + alternate_kernel_pkg_name + '-modules')
         else:
-            raise bb.parse.SkipRecipe("No KERNEL_PACKAGE_NAME_pn-%s set" % alternate_kernel )
+            raise bb.parse.SkipRecipe("No KERNEL_PACKAGE_NAME:pn-%s set" % alternate_kernel )
 }

meta-arm-autonomy/classes/docker_extern_containers.bbclass

@@ -71,7 +71,7 @@ inherit features_check
 
 REQUIRED_DISTRO_FEATURES = "docker"
 
-RDEPENDS_${PN} = "packagegroup-docker-runtime-minimal"
+RDEPENDS:${PN} = "packagegroup-docker-runtime-minimal"
 
 CONTAINER_IMAGE_FILES ??= ""
 CONTAINERS_INSTALL_DIR ??= "${datadir}/docker/images"
@@ -112,4 +112,4 @@ do_install() {
 
 do_install[vardeps] += "CONTAINER_IMAGE_FILES"
 
-FILES_${PN} += "${CONTAINERS_INSTALL_DIR}"
+FILES:${PN} += "${CONTAINERS_INSTALL_DIR}"

meta-arm-autonomy/classes/kernel-xenguest.bbclass

@@ -29,7 +29,7 @@ do_assemble_xenguest_initramfs() {
 }
 do_assemble_xenguest_initramfs[depends] += "${INITRAMFS_IMAGE}:do_merge_xenguestenv"
 
-kernel_do_deploy_append() {
+kernel_do_deploy:append() {
     if [ -f "${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest" ]; then
         install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest "$deployDir/Image-${INITRAMFS_NAME}.xenguest"
         ln -snf Image-${INITRAMFS_NAME}.xenguest $deployDir/Image-${INITRAMFS_LINK_NAME}.xenguest

meta-arm-autonomy/classes/xenguest_image_extra.bbclass

@@ -48,7 +48,7 @@ XENGUEST_IMAGE_VARS_EXTRA += "\
  XENGUEST_EXTRA_INIT_PRE XENGUEST_EXTRA_INIT XENGUEST_EXTRA_INIT_POST \
  XENGUEST_EXTRA_FILES XENGUEST_EXTRA_DISK_FILES"
 
-do_deploy_append() {
+do_deploy:append() {
     if [ -z "${XENGUEST_IMAGE_DEPLOY_DIR}" -o \
         -z "${XENGUEST_IMAGE_DEPLOY_SUBDIR}" ]; then
         die "Configuration error: XENGUEST_IMAGE_DEPLOY_DIR or XENGUEST_IMAGE_DEPLOY_SUBDIR is empty"

meta-arm-autonomy/conf/distro/include/arm-autonomy-guest.inc

@@ -1,7 +1,7 @@
 # This files is added when DISTRO_FEATURES contains arm-autonomy-guest
 
 # We need to have ipv4 activated
-DISTRO_FEATURES_append = " ipv4"
+DISTRO_FEATURES:append = " ipv4"
 
 # Build a xenguest type image
 IMAGE_CLASSES += "image_types_xenguest"
@@ -10,6 +10,6 @@ IMAGE_FSTYPES += "xenguest"
 # xenguest kernel extension to handle initramfs
 KERNEL_CLASSES += "kernel-xenguest"
 
-IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'docker', \
+IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'docker', \
                         ' packagegroup-docker-runtime-minimal', \
                         '', d)}"

meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc

@@ -3,13 +3,13 @@
 ARM_AUTONOMY_HOST_OVERRIDES = ":autonomy-host"
 
 # We need to have xen and ipv4 activated
-DISTRO_FEATURES_append = " xen ipv4"
-DISTRO_FEATURES_NATIVE_append = " arm-autonomy-host"
+DISTRO_FEATURES:append = " xen ipv4"
+DISTRO_FEATURES_NATIVE:append = " arm-autonomy-host"
 
 # Don't include kernels in standard images when building arm-autonomy-host
 # If the kernel image is needed in the rootfs the following should be set from
-# a bbappend: RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base ?= ""
+# a bbappend: RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= ""
 
 # Require extra machine specific settings from meta-arm-bsp dynamic-layers only
 # if meta-arm-bsp is in the bblayers.conf

meta-arm-autonomy/conf/layer.conf

@@ -29,7 +29,7 @@ ARM_AUTONOMY_LAYERDIR := "${LAYERDIR}"
 ARM_AUTONOMY_DISTRO_CFGDIR = "${ARM_AUTONOMY_LAYERDIR}/conf/distro/include/"
 
 # Add class to handle arm-autonomy distro extensions
-USER_CLASSES_append = " arm-autonomy-features"
+USER_CLASSES:append = " arm-autonomy-features"
 
 BBFILES_DYNAMIC += " \
     meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bbappend \

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc

@@ -1,7 +1,7 @@
 # Require extra machine specific settings
 ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE ?= ""
-ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_n1sdp = "n1sdp-extra-settings.inc"
-ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_fvp-base = "fvp-base-extra-settings.inc"
-ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_juno = "juno-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE:n1sdp = "n1sdp-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE:fvp-base = "fvp-base-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE:juno = "juno-extra-settings.inc"
 
 require ${ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE}

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc

@@ -6,7 +6,7 @@ XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/vda2"
 
 # We need to extend the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
+WKS_SEARCH_PATH:prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
 
 ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-fvp-base-disk.wks.in"
 # set wks file only if INITRAMFS_IMAGE_BUNDLE is not set

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc

@@ -7,7 +7,7 @@ XEN_DEVICETREE_DOM0_SIZE ?= "0x02400000"
 
 # We need to extend the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
+WKS_SEARCH_PATH:prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
 
 ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-juno-disk.wks.in"
 # set wks file only if INITRAMFS_IMAGE_BUNDLE is not set

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc

@@ -2,7 +2,7 @@
 
 # We need to extent the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
+WKS_SEARCH_PATH:prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
 
 ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-n1sdp-efidisk.wks.in"
 WKS_FILE = "${ARM_AUTONOMY_WKS_FILE}"
@@ -58,7 +58,7 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', \
 KERNEL_PACKAGE_NAME_alternate/kernel ?= "kernel-rt"
 # When alternate-kernel DISTRO_FEATURE is present we set the kernel-rt by
 # default
-KERNEL_PACKAGE_NAME_pn-linux-yocto-rt = "\
+KERNEL_PACKAGE_NAME:pn-linux-yocto-rt = "\
 ${@ d.getVar('KERNEL_PACKAGE_NAME_alternate/kernel') \
 if bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', True, False, d) \
 else 'kernel' }"
@@ -87,4 +87,4 @@ d.getVar('PREFERRED_PROVIDER_alternate/kernel') else ''}"
 
 # Additionnal kernel modules are necessary for n1sdp to be able to mount FAT
 # filesystems using CP437.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend

@@ -1,14 +1,14 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}:"
 
-DEPENDS_append_autonomy-host = " dos2unix-native"
+DEPENDS:append:autonomy-host = " dos2unix-native"
 
-SRC_URI_append_autonomy-host = " file://add-xen-support.patch;patchdir=../"
+SRC_URI:append:autonomy-host = " file://add-xen-support.patch;patchdir=../"
 
-do_install_append_autonomy-host() {
+do_install:append:autonomy-host() {
     mv -v ${D}/${UNPACK_DIR}/SOFTWARE/uEnv.txt \
           ${D}/${UNPACK_DIR}/SOFTWARE/uenvfile
     for dir in $(ls ${D}/${UNPACK_DIR}/SITE1/)
@@ -22,7 +22,7 @@ DEPLOY_EXTRA_DEPS_autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
 
 do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
 
-do_deploy_prepend_autonomy-host() {
+do_deploy:prepend:autonomy-host() {
     # To avoid dependency loop between firmware-image-juno:do_install,
     # xen:do_deploy and xen-devicetree:do_deploy when
     # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,10 +1,10 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS_prepend_autonomy-host_fvp-base := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:autonomy-host:fvp-base := "${THISDIR}/${PN}:"
 
 #
 # FVP BASE
 #
-SRC_URI_append_autonomy-host_fvp-base = " file://xen_u-boot_kernel_addr.patch"
+SRC_URI:append:autonomy-host:fvp-base = " file://xen_u-boot_kernel_addr.patch"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend

@@ -1,23 +1,23 @@
 # Platform dependent parameters
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # Add a dtb snippet to turn off iommu in dom0 on Juno board
-SRC_URI_append_juno = " file://xen-juno.dtsi"
-XEN_DEVICETREE_DTSI_MERGE_append_juno = " xen-juno.dtsi"
+SRC_URI:append:juno = " file://xen-juno.dtsi"
+XEN_DEVICETREE_DTSI_MERGE:append:juno = " xen-juno.dtsi"
 
 # Add a dtb snippet to remove pmu and iommu in dom0 on N1SDP
-SRC_URI_append_n1sdp = " file://xen-n1sdp.dtsi"
-XEN_DEVICETREE_DTSI_MERGE_append_n1sdp = " xen-n1sdp.dtsi"
+SRC_URI:append:n1sdp = " file://xen-n1sdp.dtsi"
+XEN_DEVICETREE_DTSI_MERGE:append:n1sdp = " xen-n1sdp.dtsi"
 # For N1SDP, the XEN_DEVICETREE_DEPEND and XEN_DEVICETREE_DTBS variables are
 # being set in meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
 
 # Board specific configs
-XEN_DEVICETREE_DOM0_BOOTARGS_append_juno = " root=/dev/sda1 rootwait"
-XEN_DEVICETREE_XEN_BOOTARGS_append_juno = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
+XEN_DEVICETREE_DOM0_BOOTARGS:append:juno = " root=/dev/sda1 rootwait"
+XEN_DEVICETREE_XEN_BOOTARGS:append:juno = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
 
-XEN_DEVICETREE_DOM0_BOOTARGS_append_n1sdp = " root=/dev/sda2 rootwait"
-XEN_DEVICETREE_XEN_BOOTARGS_append_n1sdp = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
+XEN_DEVICETREE_DOM0_BOOTARGS:append:n1sdp = " root=/dev/sda2 rootwait"
+XEN_DEVICETREE_XEN_BOOTARGS:append:n1sdp = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
 
-XEN_DEVICETREE_DOM0_BOOTARGS_append_fvp-base = " root=/dev/vda1"
-XEN_DEVICETREE_XEN_BOOTARGS_append_fvp-base = " console=dtuart dtuart=serial0 bootscrub=0"
+XEN_DEVICETREE_DOM0_BOOTARGS:append:fvp-base = " root=/dev/vda1"
+XEN_DEVICETREE_XEN_BOOTARGS:append:fvp-base = " console=dtuart dtuart=serial0 bootscrub=0"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend

@@ -1,15 +1,15 @@
 # FVP Base support
-COMPATIBLE_MACHINE_fvp-base = "fvp-base"
-FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files:"
-SRC_URI_append_fvp-base = " file://early-printk.cfg"
+COMPATIBLE_MACHINE:fvp-base = "fvp-base"
+FILESEXTRAPATHS:prepend:fvp-base := "${THISDIR}/files:"
+SRC_URI:append:fvp-base = " file://early-printk.cfg"
 
 # Juno support
-COMPATIBLE_MACHINE_juno = "juno"
-FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files:"
-SRC_URI_append_juno = " file://early-printk.cfg"
+COMPATIBLE_MACHINE:juno = "juno"
+FILESEXTRAPATHS:prepend:juno := "${THISDIR}/files:"
+SRC_URI:append:juno = " file://early-printk.cfg"
 
 # N1SDP support
-COMPATIBLE_MACHINE_n1sdp = "n1sdp"
-FILESEXTRAPATHS_prepend_n1sdp := "${THISDIR}/files:"
-SRC_URI_append_n1sdp = " file://n1sdp.cfg \
+COMPATIBLE_MACHINE:n1sdp = "n1sdp"
+FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/files:"
+SRC_URI:append:n1sdp = " file://n1sdp.cfg \
                          file://early-printk.cfg"

meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend

@@ -1,3 +1,3 @@
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-GRUB_BUILDIN_append_autonomy-host = " xen_boot"
+GRUB_BUILDIN:append:autonomy-host = " xen_boot"

meta-arm-autonomy/recipes-containers/import-docker-containers/import-docker-containers.bb

@@ -25,7 +25,7 @@ INITSCRIPT_PARAMS = "start 30 2 3 4 5 ."
 INITSCRIPT_NAME = "import_containers.sh"
 
 S = "${WORKDIR}"
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/init.d
     install -m 755 import_containers.sh ${D}${sysconfdir}/init.d
 

meta-arm-autonomy/recipes-containers/packagegroups/packagegroup-docker-runtime-minimal.bb

@@ -8,7 +8,7 @@ DESCRIPTION = "The minimal set of packages required for running Docker"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     docker-ce \
     docker-ce-contrib \
     kernel-module-xt-nat \

meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend

@@ -1,8 +1,8 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}:"
 
 # The --exclude flag in Busybox tar is required by xenguest-mkimage
-SRC_URI_append_autonomy-host = " file://feature_tar_long_options.cfg"
+SRC_URI:append:autonomy-host = " file://feature_tar_long_options.cfg"

meta-arm-autonomy/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend

@@ -3,9 +3,9 @@
 # configuration by adding network network interface configuration file under
 # interfaces.d directory.
 
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-do_install_append_autonomy-host() {
+do_install:append:autonomy-host() {
     # Add scan of interfaces.d to interfaces file
     cp -f ${WORKDIR}/interfaces ${WORKDIR}/interfaces.subdir
     echo "source-directory ${sysconfdir}/network/interfaces.d/" \

meta-arm-autonomy/recipes-devtools/qemu/qemu-autonomy-host.inc

@@ -2,7 +2,7 @@
 QEMU_TARGETS = "i386"
 
 PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
-PACKAGECONFIG_append = " noaudio"
-PACKAGECONFIG_remove = "fdt sdl kvm"
+PACKAGECONFIG:append = " noaudio"
+PACKAGECONFIG:remove = "fdt sdl kvm"
 
 require recipes-devtools/qemu/qemu-package-split.inc

meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb

@@ -16,7 +16,7 @@ DESCRIPTION = "Add entries in DTB for Xen and Dom0"
 # customizable parameters
 # kernel size is passed to xen via xen.dtb so we need to add
 # 'virtual/kernel:do_deploy' as a dependency
-XEN_DEVICETREE_DEPEND_append = " virtual/kernel:do_deploy"
+XEN_DEVICETREE_DEPEND:append = " virtual/kernel:do_deploy"
 XEN_DEVICETREE_DTBS ?= "${KERNEL_DEVICETREE}"
 XEN_DEVICETREE_XEN_BOOTARGS ?= "noreboot dom0_mem=${XEN_DEVICETREE_DOM0_MEM}"
 XEN_DEVICETREE_DOM0_MEM ?= "1024M,max:1024M"

meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend

@@ -1,4 +1,4 @@
-PACKAGECONFIG_remove = "\
+PACKAGECONFIG:remove = "\
     ${@bb.utils.contains('DISTRO_FEATURES', \
                          'arm-autonomy-host', \
                          'sdl', '', d)}"

meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend

@@ -1,7 +1,7 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}-4.14:"
+FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}-4.14:"
 
-SRC_URI_append_autonomy-host = " file://0001-vif-nat-fix-hostname.patch"
+SRC_URI:append:autonomy-host = " file://0001-vif-nat-fix-hostname.patch"

meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend

@@ -1,10 +1,10 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
 # Make Xen machine specific
 # This ensures that sstate is properly handled and that each machine can have
 # its own configuration
 PACKAGE_ARCH_autonomy-host = "${MACHINE_ARCH}"
 
-PACKAGECONFIG_remove_autonomy-host = "sdl"
+PACKAGECONFIG:remove:autonomy-host = "sdl"

meta-arm-autonomy/recipes-extended/xen/xen_4.14.bbappend

@@ -1,9 +1,9 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}-4.14:"
+FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}-4.14:"
 
-SRC_URI_append_autonomy-host = " \
+SRC_URI:append:autonomy-host = " \
     file://0001-xen-arm-Throw-messages-for-unknown-FP-SIMD-implement.patch \
     "

meta-arm-autonomy/recipes-extended/xenguest/xenguest-base-image.bb

@@ -46,7 +46,7 @@ XENGUEST_IMAGE_SRC_URI_DISK_FILES ??= ""
 
 # Add xen files
 # Any extrafiles files to be added to XENGUEST_IMAGE_SRC_URI_XEN_FILES should
-# be performed via XENGUEST_IMAGE_SRC_URI_XEN_FILES_append.
+# be performed via XENGUEST_IMAGE_SRC_URI_XEN_FILES:append.
 # The kea-subnet4.json holds the kea dhcp4 subnet configuration for Dom0.
 # And it is used when XENGUEST_IMAGE_NETWORK_TYPE="nat".
 # Any customizations to it should be performed by replacing it

meta-arm-autonomy/recipes-extended/xenguest/xenguest-extern-guests.bb

@@ -67,7 +67,7 @@ do_install() {
 
 do_install[vardeps] += "ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS"
 
-FILES_${PN} += "${XENGUEST_MANAGER_GUEST_DIR}"
+FILES:${PN} += "${XENGUEST_MANAGER_GUEST_DIR}"
 
 # In a multiconfig build this variable will hold a dependency string, which
 # differs based on whether the guest has initramfs or not.  It may have a space

meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb

@@ -56,8 +56,8 @@ do_install() {
 }
 
 # Things that we need on the target
-RDEPENDS_${PN} += "bash xenguest-mkimage lvm2 xen-tools parted e2fsprogs \
+RDEPENDS:${PN} += "bash xenguest-mkimage lvm2 xen-tools parted e2fsprogs \
                    dosfstools logrotate"
 
-FILES_${PN} += "${bindir}/xenguest-manager \
+FILES:${PN} += "${bindir}/xenguest-manager \
                ${sysconfdir}/xenguest"

meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb

@@ -31,6 +31,6 @@ do_install() {
 }
 
 # We need bash
-RDEPENDS_${PN} = "bash"
-FILES_${PN} = "${bindir}/xenguest-mkimage"
+RDEPENDS:${PN} = "bash"
+FILES:${PN} = "${bindir}/xenguest-mkimage"
 

meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb

@@ -31,13 +31,13 @@ PACKAGES =+ "${PN}-kea-dhcp4"
 # Prefix with a_ to make sure it is executed in runlevel 01 before others
 # run start script before ifupdown and run stop script after ifupdown
 INITSCRIPT_PACKAGES = "${PN} ${PN}-kea-dhcp4"
-INITSCRIPT_NAME_${PN} = "a_xenguest-network-bridge"
-INITSCRIPT_PARAMS_${PN} = "start 01 2 3 4 5 . stop 81 0 1 6 ."
+INITSCRIPT_NAME:${PN} = "a_xenguest-network-bridge"
+INITSCRIPT_PARAMS:${PN} = "start 01 2 3 4 5 . stop 81 0 1 6 ."
 
 # Kea configuration needs to be restored before kea init scripts:
 # Kea dhcp4 server is 30, so lets use 20, to have higher priority
-INITSCRIPT_NAME_${PN}-kea-dhcp4 = "kea-restore-default-config"
-INITSCRIPT_PARAMS_${PN}-kea-dhcp4 = "defaults 20"
+INITSCRIPT_NAME:${PN}-kea-dhcp4 = "kea-restore-default-config"
+INITSCRIPT_PARAMS:${PN}-kea-dhcp4 = "defaults 20"
 
 inherit allarch update-rc.d
 
@@ -77,7 +77,7 @@ do_install() {
         ${D}${sysconfdir}/kea/kea-dhcp4.conf.original
 }
 
-RDEPENDS_${PN} += "bridge-utils \
+RDEPENDS:${PN} += "bridge-utils \
                    iptables \
                    kea \
                    ${PN}-kea-dhcp4 \
@@ -87,10 +87,10 @@ RDEPENDS_${PN} += "bridge-utils \
                    kernel-module-xt-nat \
                    kernel-module-xt-masquerade \
                   "
-FILES_${PN} += "${sysconfdir}/network/interfaces.d/xenguest-network-bridge.cfg"
-FILES_${PN} += "${sysconfdir}/xenguest/init.pre/network-bridge.sh"
-FILES_${PN} += "${sysconfdir}/xen/scripts/vif-post.d/00-vif-xenguest.hook"
+FILES:${PN} += "${sysconfdir}/network/interfaces.d/xenguest-network-bridge.cfg"
+FILES:${PN} += "${sysconfdir}/xenguest/init.pre/network-bridge.sh"
+FILES:${PN} += "${sysconfdir}/xen/scripts/vif-post.d/00-vif-xenguest.hook"
 
-FILES_${PN}-kea-dhcp4 = "${sysconfdir}/kea/kea-dhcp4.conf.original"
-FILES_${PN}-kea-dhcp4 += "${sysconfdir}/init.d/${INITSCRIPT_NAME_${PN}-kea-dhcp4}"
-FILES_${PN}-kea-dhcp4 += "${sysconfdir}/xenguest/init.post/xenguest-network-init-post.sh"
+FILES:${PN}-kea-dhcp4 = "${sysconfdir}/kea/kea-dhcp4.conf.original"
+FILES:${PN}-kea-dhcp4 += "${sysconfdir}/init.d/${INITSCRIPT_NAME_${PN}-kea-dhcp4}"
+FILES:${PN}-kea-dhcp4 += "${sysconfdir}/xenguest/init.post/xenguest-network-init-post.sh"

meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc

@@ -1,11 +1,11 @@
 # Add arm-autonomy specific features to the kernel
 
-FILESEXTRAPATHS_prepend := "${THISDIR}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}:"
 
 #
 # arm-autonomy kmeta
 #
-SRC_URI_append = " file://arm-autonomy-kmeta;type=kmeta;name=arm-autonomy-kmeta;destsuffix=arm-autonomy-kmeta"
+SRC_URI:append = " file://arm-autonomy-kmeta;type=kmeta;name=arm-autonomy-kmeta;destsuffix=arm-autonomy-kmeta"
 
 # Add common Xen (host and guest) configs and patches
 KERNEL_FEATURES += "${@bb.utils.contains_any('DISTRO_FEATURES', \
@@ -27,8 +27,8 @@ KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
 
 
 # Add support for arm64-autonomy-guest machine
-COMPATIBLE_MACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
-KMACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
+COMPATIBLE_MACHINE:arm64-autonomy-guest = "arm64-autonomy-guest"
+KMACHINE:arm64-autonomy-guest = "arm64-autonomy-guest"
 
 # Add Minimal Kernel Configs for Docker runtime
 KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \

meta-arm-bsp/conf/layer.conf

@@ -13,8 +13,8 @@ LAYERSERIES_COMPAT_meta-arm-bsp = "hardknott honister"
 
 LAYERDEPENDS_meta-arm-bsp = "core meta-arm"
 # This won't be used by layerindex-fetch, but works everywhere else
-LAYERDEPENDS_meta-arm-bsp_append_musca-b1 = " meta-python"
-LAYERDEPENDS_meta-arm-bsp_append_musca-s1 = " meta-python"
+LAYERDEPENDS_meta-arm-bsp:append:musca-b1 = " meta-python"
+LAYERDEPENDS_meta-arm-bsp:append:musca-s1 = " meta-python"
 
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/custom-licenses"

meta-arm-bsp/conf/machine/corstone700-fvp.conf

@@ -6,7 +6,7 @@ require conf/machine/include/corstone700.inc
 
 # default feature used: eth_lan91c111
 # add the following line to local.conf to disable the feature:
-# MACHINE_FEATURES_remove = "eth_lan91c111"
+# MACHINE_FEATURES:remove = "eth_lan91c111"
 MACHINE_FEATURES += "eth_lan91c111"
 
 TFA_TARGET_PLATFORM = "fvp"

meta-arm-bsp/conf/machine/corstone700-mps3.conf

@@ -6,12 +6,12 @@ require conf/machine/include/corstone700.inc
 
 # default feature used: eth_lan9115
 # add the following line to local.conf to disable the feature:
-# MACHINE_FEATURES_remove = "eth_lan9115"
+# MACHINE_FEATURES:remove = "eth_lan9115"
 MACHINE_FEATURES += "eth_lan9115"
 
 # default feature used: usb_host
 # add the following line to local.conf to disable the feature:
-# MACHINE_FEATURES_remove = "usb_host"
+# MACHINE_FEATURES:remove = "usb_host"
 MACHINE_FEATURES += "usb_host"
 
 TFA_TARGET_PLATFORM = "fpga"

meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf

@@ -22,7 +22,7 @@ WKS_FILE ?= "fvp-base.wks"
 # As this is a virtual target that will not be used in the real world there is
 # no need for real SSH keys.  Disable rng-tools (which takes too long to
 # initialise) and install the pre-generated keys.
-PACKAGECONFIG_remove_pn-openssh = "rng-tools"
+PACKAGECONFIG:remove:pn-openssh = "rng-tools"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
 
 FVP_EXTRA_ARGS = "-a cluster0*=${DEPLOY_DIR_IMAGE}/linux-system.axf"

meta-arm-bsp/conf/machine/fvp-common.inc

@@ -23,5 +23,5 @@ EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 # As this is a virtual target that will not be used in the real world there is
 # no need for real SSH keys.  Disable rng-tools (which takes too long to
 # initialise) and install the pre-generated keys.
-PACKAGECONFIG_remove_pn-openssh = "rng-tools"
+PACKAGECONFIG:remove:pn-openssh = "rng-tools"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"

meta-arm-bsp/conf/machine/include/arm/arch-armv6m.inc

@@ -14,6 +14,6 @@ require conf/machine/include/arm/arch-armv5.inc
 
 # Little Endian
 AVAILTUNES += "armv6m"
-ARMPKGARCH_tune-armv6m             = "armv6m"
-TUNE_FEATURES_tune-armv6m          = "armv6m"
-PACKAGE_EXTRA_ARCHS_tune-armv6m    = "armv6m"
+ARMPKGARCH:tune-armv6m             = "armv6m"
+TUNE_FEATURES:tune-armv6m          = "armv6m"
+PACKAGE_EXTRA_ARCHS:tune-armv6m    = "armv6m"

meta-arm-bsp/conf/machine/include/arm/arch-armv7em.inc

@@ -12,6 +12,6 @@ TUNECONFLICTS[armv7em] = "armv4 armv5 armv6 armv7a"
 require conf/machine/include/arm/arch-armv7m.inc
 
 AVAILTUNES                            += "armv7em"
-ARMPKGARCH_tune-armv7em                = "armv7em"
-TUNE_FEATURES_tune-armv7em             = "armv7em"
-PACKAGE_EXTRA_ARCHS_tune-armv7em       = "armv7em"
+ARMPKGARCH:tune-armv7em                = "armv7em"
+TUNE_FEATURES:tune-armv7em             = "armv7em"
+PACKAGE_EXTRA_ARCHS:tune-armv7em       = "armv7em"

meta-arm-bsp/conf/machine/include/arm/arch-armv7m.inc

@@ -12,6 +12,6 @@ TUNECONFLICTS[armv7m] = "armv4 armv5 armv6 armv7a"
 require conf/machine/include/arm/arch-armv6m.inc
 
 AVAILTUNES                            += "armv7m"
-ARMPKGARCH_tune-armv7m                 = "armv7m"
-TUNE_FEATURES_tune-armv7m              = "armv7m"
-PACKAGE_EXTRA_ARCHS_tune-armv7m        = "armv7m"
+ARMPKGARCH:tune-armv7m                 = "armv7m"
+TUNE_FEATURES:tune-armv7m              = "armv7m"
+PACKAGE_EXTRA_ARCHS:tune-armv7m        = "armv7m"

meta-arm-bsp/conf/machine/include/arm/arch-armv8-1m-main.inc

@@ -13,6 +13,6 @@ TUNECONFLICTS[armv8-1m-main] = "armv4 armv5 armv6 armv7a"
 require conf/machine/include/arm/arch-armv8m-main.inc
 
 AVAILTUNES                            += "armv8-1m-main"
-ARMPKGARCH_tune-armv8-1m-main          = "armv8-1m-main"
-TUNE_FEATURES_tune-armv8-1m-main       = "armv8-1m-main"
-PACKAGE_EXTRA_ARCHS_tune-armv8-1m-main = "armv8-1m-main"
+ARMPKGARCH:tune-armv8-1m-main          = "armv8-1m-main"
+TUNE_FEATURES:tune-armv8-1m-main       = "armv8-1m-main"
+PACKAGE_EXTRA_ARCHS:tune-armv8-1m-main = "armv8-1m-main"

meta-arm-bsp/conf/machine/include/arm/arch-armv8-2a.inc

@@ -8,11 +8,11 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8-2a', 'armv8-2a
 require conf/machine/include/arm/arch-armv8a.inc
 
 AVAILTUNES += "armv8-2a armv8-2a-crypto"
-ARMPKGARCH_tune-armv8-2a                    ?= "armv8-2a"
-ARMPKGARCH_tune-armv8-2a-crypto             ?= "armv8-2a"
-TUNE_FEATURES_tune-armv8-2a                  = "aarch64 armv8-2a"
-TUNE_FEATURES_tune-armv8-2a-crypto           = "${TUNE_FEATURES_tune-armv8-2a} crypto"
-PACKAGE_EXTRA_ARCHS_tune-armv8-2a            = "${PACKAGE_EXTRA_ARCHS_tune-armv8a} armv8-2a"
-PACKAGE_EXTRA_ARCHS_tune-armv8-2a-crypto     = "${PACKAGE_EXTRA_ARCHS_tune-armv8-2a} armv8-2a-crypto"
-BASE_LIB_tune-armv8-2a                       = "lib64"
-BASE_LIB_tune-armv8-2a-crypto                = "lib64"
+ARMPKGARCH:tune-armv8-2a                    ?= "armv8-2a"
+ARMPKGARCH:tune-armv8-2a-crypto             ?= "armv8-2a"
+TUNE_FEATURES:tune-armv8-2a                  = "aarch64 armv8-2a"
+TUNE_FEATURES:tune-armv8-2a-crypto           = "${TUNE_FEATURES:tune-armv8-2a} crypto"
+PACKAGE_EXTRA_ARCHS:tune-armv8-2a            = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv8-2a"
+PACKAGE_EXTRA_ARCHS:tune-armv8-2a-crypto     = "${PACKAGE_EXTRA_ARCHS:tune-armv8-2a} armv8-2a-crypto"
+BASE_LIB:tune-armv8-2a                       = "lib64"
+BASE_LIB:tune-armv8-2a-crypto                = "lib64"

meta-arm-bsp/conf/machine/include/arm/arch-armv8-4a.inc

@@ -9,11 +9,11 @@ require conf/machine/include/arm/arch-armv8a.inc
 
 # Little Endian base configs
 AVAILTUNES += "armv8-4a armv8-4a-crypto"
-ARMPKGARCH_tune-armv8-4a                    ?= "armv8-4a"
-ARMPKGARCH_tune-armv8-4a-crypto             ?= "armv8-4a"
-TUNE_FEATURES_tune-armv8-4a                  = "aarch64 armv8-4a"
-TUNE_FEATURES_tune-armv8-4a-crypto           = "${TUNE_FEATURES_tune-armv8-4a} crypto"
-PACKAGE_EXTRA_ARCHS_tune-armv8-4a            = "${PACKAGE_EXTRA_ARCHS_tune-armv8a} armv8-4a"
-PACKAGE_EXTRA_ARCHS_tune-armv8-4a-crypto     = "${PACKAGE_EXTRA_ARCHS_tune-armv8-4a} armv8-4a-crypto"
-BASE_LIB_tune-armv8-4a                       = "lib64"
-BASE_LIB_tune-armv8-4a-crypto                = "lib64"
+ARMPKGARCH:tune-armv8-4a                    ?= "armv8-4a"
+ARMPKGARCH:tune-armv8-4a-crypto             ?= "armv8-4a"
+TUNE_FEATURES:tune-armv8-4a                  = "aarch64 armv8-4a"
+TUNE_FEATURES:tune-armv8-4a-crypto           = "${TUNE_FEATURES:tune-armv8-4a} crypto"
+PACKAGE_EXTRA_ARCHS:tune-armv8-4a            = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv8-4a"
+PACKAGE_EXTRA_ARCHS:tune-armv8-4a-crypto     = "${PACKAGE_EXTRA_ARCHS:tune-armv8-4a} armv8-4a-crypto"
+BASE_LIB:tune-armv8-4a                       = "lib64"
+BASE_LIB:tune-armv8-4a-crypto                = "lib64"

meta-arm-bsp/conf/machine/include/arm/arch-armv8m-base.inc

@@ -12,6 +12,6 @@ TUNECONFLICTS[armv8m-base] = "armv4 armv5 armv6 armv7a"
 require conf/machine/include/arm/arch-armv7m.inc
 
 AVAILTUNES                          += "armv8m-base"
-ARMPKGARCH_tune-armv8m-base          = "armv8m-base"
-TUNE_FEATURES_tune-armv8m-base       = "armv8m-base"
-PACKAGE_EXTRA_ARCHS_tune-armv8m-base = "armv8m-base"
+ARMPKGARCH:tune-armv8m-base          = "armv8m-base"
+TUNE_FEATURES:tune-armv8m-base       = "armv8m-base"
+PACKAGE_EXTRA_ARCHS:tune-armv8m-base = "armv8m-base"

meta-arm-bsp/conf/machine/include/arm/arch-armv8m-main.inc

@@ -22,15 +22,15 @@ TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv5spd16', 'fpv5-s
 MARCH_FPU = "${@bb.utils.contains('TUNE_FEATURES', [ 'vfpv5spd16' ], '+fp', '+nofp', d)}"
 
 AVAILTUNES                                      += "armv8m-main armv8m-mainearmv8m-main-vfpv5spd16 armv8m-maine-vfpv5spd16"
-ARMPKGARCH_tune-armv8m-main                      = "armv8m-main"
-ARMPKGARCH_tune-armv8m-maine                     = "armv8m-main"
-ARMPKGARCH_tune-armv8m-main-vfpv5spd16           = "armv8m-main"
-ARMPKGARCH_tune-armv8m-maine-vfpv5spd16          = "armv8m-main"
-TUNE_FEATURES_tune-armv8m-main                   = "armv8m-main"
-TUNE_FEATURES_tune-armv8m-maine                  = "${TUNE_FEATURES_tune-armv8m-main} dsp"
-TUNE_FEATURES_tune-armv8m-main-vfpv5spd16        = "${TUNE_FEATURES_tune-armv8m-main} vfpv5spd16"
-TUNE_FEATURES_tune-armv8m-maine-vfpv5spd16       = "${TUNE_FEATURES_tune-armv8m-main-vfpv5spd16} dsp"
-PACKAGE_EXTRA_ARCHS_tune-armv8m-main             = "armv8m-main"
-PACKAGE_EXTRA_ARCHS_tune-armv8m-maine            = "${PACKAGE_EXTRA_ARCHS_tune-armv8m-main} armv8m-maine"
-PACKAGE_EXTRA_ARCHS_tune-armv8m-main-vfpv5spd16  = "${PACKAGE_EXTRA_ARCHS_tune-armv8m-main} armv8m-main-fpv5-spd16"
-PACKAGE_EXTRA_ARCHS_tune-armv8m-maine-vfpv5spd16 = "${PACKAGE_EXTRA_ARCHS_tune-armv8m-main} armv8m-maine-fpv5-spd16"
+ARMPKGARCH:tune-armv8m-main                      = "armv8m-main"
+ARMPKGARCH:tune-armv8m-maine                     = "armv8m-main"
+ARMPKGARCH:tune-armv8m-main-vfpv5spd16           = "armv8m-main"
+ARMPKGARCH:tune-armv8m-maine-vfpv5spd16          = "armv8m-main"
+TUNE_FEATURES:tune-armv8m-main                   = "armv8m-main"
+TUNE_FEATURES:tune-armv8m-maine                  = "${TUNE_FEATURES:tune-armv8m-main} dsp"
+TUNE_FEATURES:tune-armv8m-main-vfpv5spd16        = "${TUNE_FEATURES:tune-armv8m-main} vfpv5spd16"
+TUNE_FEATURES:tune-armv8m-maine-vfpv5spd16       = "${TUNE_FEATURES:tune-armv8m-main-vfpv5spd16} dsp"
+PACKAGE_EXTRA_ARCHS:tune-armv8m-main             = "armv8m-main"
+PACKAGE_EXTRA_ARCHS:tune-armv8m-maine            = "${PACKAGE_EXTRA_ARCHS:tune-armv8m-main} armv8m-maine"
+PACKAGE_EXTRA_ARCHS:tune-armv8m-main-vfpv5spd16  = "${PACKAGE_EXTRA_ARCHS:tune-armv8m-main} armv8m-main-fpv5-spd16"
+PACKAGE_EXTRA_ARCHS:tune-armv8m-maine-vfpv5spd16 = "${PACKAGE_EXTRA_ARCHS:tune-armv8m-main} armv8m-maine-fpv5-spd16"

meta-arm-bsp/conf/machine/include/arm/armv8r/arch-armv8r64.inc

@@ -12,15 +12,15 @@ require conf/machine/include/arm/arch-arm64.inc
 
 # Little Endian base configs
 AVAILTUNES += "armv8r armv8r-crc armv8r-crypto"
-ARMPKGARCH_tune-armv8r                    ?= "armv8r"
-ARMPKGARCH_tune-armv8r-crc                ?= "armv8r"
-ARMPKGARCH_tune-armv8r-crypto             ?= "armv8r"
-TUNE_FEATURES_tune-armv8r                  = "aarch64 armv8r"
-TUNE_FEATURES_tune-armv8r-crc              = "${TUNE_FEATURES_tune-armv8r} crc"
-TUNE_FEATURES_tune-armv8r-crypto           = "${TUNE_FEATURES_tune-armv8r} crypto"
-PACKAGE_EXTRA_ARCHS_tune-armv8r            = "aarch64 armv8r"
-PACKAGE_EXTRA_ARCHS_tune-armv8r-crc        = "${PACKAGE_EXTRA_ARCHS_tune-armv8r} armv8r-crc"
-PACKAGE_EXTRA_ARCHS_tune-armv8r-crypto     = "${PACKAGE_EXTRA_ARCHS_tune-armv8r} armv8r-crypto"
-BASE_LIB_tune-armv8r                       = "lib64"
-BASE_LIB_tune-armv8r-crc                   = "lib64"
-BASE_LIB_tune-armv8r-crypto                = "lib64"
+ARMPKGARCH:tune-armv8r                    ?= "armv8r"
+ARMPKGARCH:tune-armv8r-crc                ?= "armv8r"
+ARMPKGARCH:tune-armv8r-crypto             ?= "armv8r"
+TUNE_FEATURES:tune-armv8r                  = "aarch64 armv8r"
+TUNE_FEATURES:tune-armv8r-crc              = "${TUNE_FEATURES:tune-armv8r} crc"
+TUNE_FEATURES:tune-armv8r-crypto           = "${TUNE_FEATURES:tune-armv8r} crypto"
+PACKAGE_EXTRA_ARCHS:tune-armv8r            = "aarch64 armv8r"
+PACKAGE_EXTRA_ARCHS:tune-armv8r-crc        = "${PACKAGE_EXTRA_ARCHS:tune-armv8r} armv8r-crc"
+PACKAGE_EXTRA_ARCHS:tune-armv8r-crypto     = "${PACKAGE_EXTRA_ARCHS:tune-armv8r} armv8r-crypto"
+BASE_LIB:tune-armv8r                       = "lib64"
+BASE_LIB:tune-armv8r-crc                   = "lib64"
+BASE_LIB:tune-armv8r-crypto                = "lib64"

meta-arm-bsp/conf/machine/include/corstone700.inc

@@ -8,7 +8,7 @@ TFA_PLATFORM = "corstone700"
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel_corstone700 = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.6%"
 
 PREFERRED_VERSION_trusted-firmware-a ?= "2.5%"
@@ -24,7 +24,7 @@ EXTRA_IMAGEDEPENDS += " \
                       virtual/control-processor-firmware  \
                       "
 
-WKS_FILE_DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}"
+WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
 WKS_FILE ?= "arm-reference-image.corstone700.wks"
 

meta-arm-bsp/conf/machine/include/tune-cortexm0.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0', ' -mcpu=cortex
 require conf/machine/include/arm/arch-armv6m.inc
 
 AVAILTUNES                            += "cortexm0"
-ARMPKGARCH_tune-cortexm0               = "cortexm0"
-TUNE_FEATURES_tune-cortexm0            = "${TUNE_FEATURES_tune-armv6m} cortexm0"
-PACKAGE_EXTRA_ARCHS_tune-cortexm0      = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0"
+ARMPKGARCH:tune-cortexm0               = "cortexm0"
+TUNE_FEATURES:tune-cortexm0            = "${TUNE_FEATURES:tune-armv6m} cortexm0"
+PACKAGE_EXTRA_ARCHS:tune-cortexm0      = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0"

meta-arm-bsp/conf/machine/include/tune-cortexm0plus.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0-plus', ' -mcpu=c
 require conf/machine/include/arm/arch-armv6m.inc
 
 AVAILTUNES                            += "cortexm0-plus"
-ARMPKGARCH_tune-cortexm0-plus          = "cortexm0-plus"
-TUNE_FEATURES_tune-cortexm0-plus       = "${TUNE_FEATURES_tune-armv6m} cortexm0-plus"
-PACKAGE_EXTRA_ARCHS_tune-cortexm0-plus = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0-plus"
+ARMPKGARCH:tune-cortexm0-plus          = "cortexm0-plus"
+TUNE_FEATURES:tune-cortexm0-plus       = "${TUNE_FEATURES:tune-armv6m} cortexm0-plus"
+PACKAGE_EXTRA_ARCHS:tune-cortexm0-plus = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0-plus"

meta-arm-bsp/conf/machine/include/tune-cortexm1.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm1', ' -mcpu=cortex
 require conf/machine/include/arm/arch-armv6m.inc
 
 AVAILTUNES                            += "cortexm1"
-ARMPKGARCH_tune-cortexm1               = "cortexm1"
-TUNE_FEATURES_tune-cortexm1            = "${TUNE_FEATURES_tune-armv6m} cortexm1"
-PACKAGE_EXTRA_ARCHS_tune-cortexm1      = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm1"
+ARMPKGARCH:tune-cortexm1               = "cortexm1"
+TUNE_FEATURES:tune-cortexm1            = "${TUNE_FEATURES:tune-armv6m} cortexm1"
+PACKAGE_EXTRA_ARCHS:tune-cortexm1      = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm1"

meta-arm-bsp/conf/machine/include/tune-cortexm23.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm23', ' -mcpu=corte
 require conf/machine/include/arm/arch-armv8m-base.inc
 
 AVAILTUNES                          += "cortexm23"
-ARMPKGARCH_tune-cortexm23            = "cortexm23"
-TUNE_FEATURES_tune-cortexm23         = "${TUNE_FEATURES_tune-armv8m-base} cortexm23"
-PACKAGE_EXTRA_ARCHS_tune-cortexm23   = "${PACKAGE_EXTRA_ARCHS_tune-armv8m-base} cortexm23"
+ARMPKGARCH:tune-cortexm23            = "cortexm23"
+TUNE_FEATURES:tune-cortexm23         = "${TUNE_FEATURES:tune-armv8m-base} cortexm23"
+PACKAGE_EXTRA_ARCHS:tune-cortexm23   = "${PACKAGE_EXTRA_ARCHS:tune-armv8m-base} cortexm23"

meta-arm-bsp/conf/machine/include/tune-cortexm3.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm3', ' -mcpu=cortex
 require conf/machine/include/arm/arch-armv7m.inc
 
 AVAILTUNES                            += "cortexm3"
-ARMPKGARCH_tune-cortexm3               = "cortexm3"
-TUNE_FEATURES_tune-cortexm3            = "${TUNE_FEATURES_tune-armv7m} cortexm3"
-PACKAGE_EXTRA_ARCHS_tune-cortexm3      = "${PACKAGE_EXTRA_ARCHS_tune-armv7m} cortexm3"
+ARMPKGARCH:tune-cortexm3               = "cortexm3"
+TUNE_FEATURES:tune-cortexm3            = "${TUNE_FEATURES:tune-armv7m} cortexm3"
+PACKAGE_EXTRA_ARCHS:tune-cortexm3      = "${PACKAGE_EXTRA_ARCHS:tune-armv7m} cortexm3"

meta-arm-bsp/conf/machine/include/tune-cortexm33.inc

@@ -12,6 +12,6 @@ require conf/machine/include/arm/arch-armv8m-main.inc
 # optional.  So forcing below so that compiling works, but this should
 # be fixed in GCC
 AVAILTUNES                          += "cortexm33"
-ARMPKGARCH_tune-cortexm33            = "cortexm33"
-TUNE_FEATURES_tune-cortexm33         = "${TUNE_FEATURES_tune-armv8m-maine-vfpv5spd16} cortexm33"
-PACKAGE_EXTRA_ARCHS_tune-cortexm33   = "${PACKAGE_EXTRA_ARCHS_tune-armv8m-maine-vfpv5spd16} cortexm33e-fpv5-spd16"
+ARMPKGARCH:tune-cortexm33            = "cortexm33"
+TUNE_FEATURES:tune-cortexm33         = "${TUNE_FEATURES:tune-armv8m-maine-vfpv5spd16} cortexm33"
+PACKAGE_EXTRA_ARCHS:tune-cortexm33   = "${PACKAGE_EXTRA_ARCHS:tune-armv8m-maine-vfpv5spd16} cortexm33e-fpv5-spd16"

meta-arm-bsp/conf/machine/include/tune-cortexm35p.inc

@@ -12,6 +12,6 @@ require conf/machine/include/arm/arch-armv8m-main.inc
 # optional.  So forcing below so that compiling works, but this should
 # be fixed in GCC
 AVAILTUNES                          += "cortexm35p"
-ARMPKGARCH_tune-cortexm35p           = "cortexm35p"
-TUNE_FEATURES_tune-cortexm35p        = "${TUNE_FEATURES_tune-armv8m-maine-vfpv5spd16} cortexm35p"
-PACKAGE_EXTRA_ARCHS_tune-cortexm35p  = "${PACKAGE_EXTRA_ARCHS_tune-armv8m-maine-vfpv5spd16} cortexm35pe-fpv5-spd16"
+ARMPKGARCH:tune-cortexm35p           = "cortexm35p"
+TUNE_FEATURES:tune-cortexm35p        = "${TUNE_FEATURES:tune-armv8m-maine-vfpv5spd16} cortexm35p"
+PACKAGE_EXTRA_ARCHS:tune-cortexm35p  = "${PACKAGE_EXTRA_ARCHS:tune-armv8m-maine-vfpv5spd16} cortexm35pe-fpv5-spd16"

meta-arm-bsp/conf/machine/include/tune-cortexm4.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm4', ' -mcpu=cortex
 require conf/machine/include/arm/arch-armv7em.inc
 
 AVAILTUNES                            += "cortexm4"
-ARMPKGARCH_tune-cortexm4               = "cortexm4"
-TUNE_FEATURES_tune-cortexm4            = "${TUNE_FEATURES_tune-armv7em} cortexm4"
-PACKAGE_EXTRA_ARCHS_tune-cortexm4      = "${PACKAGE_EXTRA_ARCHS_tune-armv7em} cortexm4"
+ARMPKGARCH:tune-cortexm4               = "cortexm4"
+TUNE_FEATURES:tune-cortexm4            = "${TUNE_FEATURES:tune-armv7em} cortexm4"
+PACKAGE_EXTRA_ARCHS:tune-cortexm4      = "${PACKAGE_EXTRA_ARCHS:tune-armv7em} cortexm4"

meta-arm-bsp/conf/machine/include/tune-cortexm55.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm55', ' -mcpu=corte
 require conf/machine/include/arm/arch-armv8-1m-main.inc
 
 AVAILTUNES                            += "cortexm55"
-ARMPKGARCH_tune-cortexm55              = "cortexm55"
-TUNE_FEATURES_tune-cortexm55           = "${TUNE_FEATURES_tune-armv8-1m-main} cortexm55"
-PACKAGE_EXTRA_ARCHS_tune-cortexm55     = "${PACKAGE_EXTRA_ARCHS_tune-armv8-1m-main} cortexm55"
+ARMPKGARCH:tune-cortexm55              = "cortexm55"
+TUNE_FEATURES:tune-cortexm55           = "${TUNE_FEATURES:tune-armv8-1m-main} cortexm55"
+PACKAGE_EXTRA_ARCHS:tune-cortexm55     = "${PACKAGE_EXTRA_ARCHS:tune-armv8-1m-main} cortexm55"

meta-arm-bsp/conf/machine/include/tune-cortexm7.inc

@@ -9,6 +9,6 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm7', ' -mcpu=cortex
 require conf/machine/include/arm/arch-armv7em.inc
 
 AVAILTUNES                            += "cortexm7"
-ARMPKGARCH_tune-cortexm7               = "cortexm7"
-TUNE_FEATURES_tune-cortexm7            = "${TUNE_FEATURES_tune-armv7em} cortexm7"
-PACKAGE_EXTRA_ARCHS_tune-cortexm7      = "${PACKAGE_EXTRA_ARCHS_tune-armv7em} cortexm7"
+ARMPKGARCH:tune-cortexm7               = "cortexm7"
+TUNE_FEATURES:tune-cortexm7            = "${TUNE_FEATURES:tune-armv7em} cortexm7"
+PACKAGE_EXTRA_ARCHS:tune-cortexm7      = "${PACKAGE_EXTRA_ARCHS:tune-armv7em} cortexm7"

meta-arm-bsp/conf/machine/include/tune-neoversen1.inc

@@ -8,7 +8,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
 
 # Little Endian base configs
 AVAILTUNES += "neoversen1"
-ARMPKGARCH_tune-neoversen1             = "neoversen1"
-TUNE_FEATURES_tune-neoversen1          = "aarch64 neoversen1 crc crypto"
-PACKAGE_EXTRA_ARCHS_tune-neoversen1    = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} neoversen1"
-BASE_LIB_tune-neoversen1               = "lib64"
+ARMPKGARCH:tune-neoversen1             = "neoversen1"
+TUNE_FEATURES:tune-neoversen1          = "aarch64 neoversen1 crc crypto"
+PACKAGE_EXTRA_ARCHS:tune-neoversen1    = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} neoversen1"
+BASE_LIB:tune-neoversen1               = "lib64"

meta-arm-bsp/conf/machine/musca-b1.conf

@@ -23,6 +23,6 @@ QB_RNG = ""
 # Zephyr RTOS settings
 ZEPHYR_BOARD = "v2m_musca_b1"
 ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
-ARCH_musca-b1 = "arm"
+ARCH:musca-b1 = "arm"
 
 TFM_PLATFORM = "musca_b1/sse_200"

meta-arm-bsp/conf/machine/n1sdp.conf

@@ -15,7 +15,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 # Set default WKS
 WKS_FILE ?= "n1sdp-efidisk.wks"
 IMAGE_EFI_BOOT_FILES ?= "n1sdp-multi-chip.dtb n1sdp-single-chip.dtb"
-WKS_FILE_DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}"
+WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
 # Use kernel provided by yocto
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"

meta-arm-bsp/conf/machine/sgi575.conf

@@ -26,4 +26,4 @@ MACHINE_FEATURES += "efi"
 IMAGE_FSTYPES += "cpio.gz wic"
 
 WKS_FILE ?= "sgi575-efidisk.wks"
-WKS_FILE_DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}"
+WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"

meta-arm-bsp/recipes-bsp/boot-firmware/boot-firmware_git.bb

@@ -50,10 +50,10 @@ do_install() {
         --out ${D}/firmware/spitoc.bin
 }
 
-FILES_${PN} = "/firmware"
+FILES:${PN} = "/firmware"
 SYSROOT_DIRS += "/firmware"
 # Skip QA check for relocations in .text of elf binaries
-INSANE_SKIP_${PN} = "textrel"
+INSANE_SKIP:${PN} = "textrel"
 
 do_deploy() {
     # Copy the images to deploy directory

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64-fvp-baser-aemv8r64.inc

@@ -1,7 +1,7 @@
 COMPATIBLE_MACHINE = "fvp-baser-aemv8r64"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${MACHINE}:"
-SRC_URI_append = " \
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/${MACHINE}:"
+SRC_URI:append = " \
     file://0001-Decouple-V2M_SYS-config-by-auto-detect-dtb-node.patch \
     file://0002-arch64-Introduce-EL2-boot-code-for-v8-r64.patch \
     file://0003-Allow-enable-psci-to-choose-between-smc-and-hvc.patch \

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend

@@ -1,4 +1,4 @@
 MACHINE_BOOT_WRAPPER_AARCH64_REQUIRE ?= ""
-MACHINE_BOOT_WRAPPER_AARCH64_REQUIRE_fvp-baser-aemv8r64 ?= "boot-wrapper-aarch64-fvp-baser-aemv8r64.inc"
+MACHINE_BOOT_WRAPPER_AARCH64_REQUIRE:fvp-baser-aemv8r64 ?= "boot-wrapper-aarch64-fvp-baser-aemv8r64.inc"
 
 require ${MACHINE_BOOT_WRAPPER_AARCH64_REQUIRE}

meta-arm-bsp/recipes-bsp/external-system/external-system_0.1.0.bb

@@ -34,7 +34,7 @@ do_install() {
     install -D -p -m 0644 ${B}/product/${PRODUCT}/firmware/release/bin/firmware.bin ${D}/firmware/es_flashfw.bin
 }
 
-FILES_${PN} = "/firmware"
+FILES:${PN} = "/firmware"
 SYSROOT_DIRS += "/firmware"
 
 inherit deploy

meta-arm-bsp/recipes-bsp/hafnium/hafnium_2.5.bbappend

@@ -1,6 +1,6 @@
 # Machine specific configurations
 
 MACHINE_HAFNIUM_REQUIRE ?= ""
-MACHINE_HAFNIUM_REQUIRE_tc0 = "hafnium-tc0.inc"
+MACHINE_HAFNIUM_REQUIRE:tc0 = "hafnium-tc0.inc"
 
 require ${MACHINE_HAFNIUM_REQUIRE}

meta-arm-bsp/recipes-bsp/images/n1sdp-board-firmware_2020.07.27.bb

@@ -24,7 +24,7 @@ do_install() {
     cp -Rp --no-preserve=ownership ${S}/* ${D}${INSTALL_DIR}
 }
 
-FILES_${PN} = "${INSTALL_DIR}"
+FILES:${PN} = "${INSTALL_DIR}"
 SYSROOT_DIRS += "${INSTALL_DIR}"
 
 do_deploy() {

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-juno.inc

@@ -4,4 +4,4 @@ COMPATIBLE_MACHINE = "juno"
 
 SCP_PLATFORM = "juno"
 FW_TARGETS = "scp"
-FW_INSTALL_append = " romfw_bypass"
+FW_INSTALL:append = " romfw_bypass"

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc

@@ -3,18 +3,18 @@
 SCP_PLATFORM  = "n1sdp"
 SCP_LOG_LEVEL = "INFO"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
    file://enabling-coresight-debug-non-secure-access.patch \
    "
 
-COMPATIBLE_MACHINE_n1sdp = "n1sdp"
+COMPATIBLE_MACHINE:n1sdp = "n1sdp"
 
 DEPENDS += "fiptool-native"
 DEPENDS += "virtual/trusted-firmware-a"
 
-do_install_append() {
+do_install:append() {
    fiptool \
        create \
        --scp-fw "${D}/firmware/scp_ramfw.bin" \

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc

@@ -3,7 +3,7 @@
 SCP_PLATFORM  = "sgi575"
 SCP_LOG_LEVEL = "INFO"
 
-COMPATIBLE_MACHINE_sgi575 = "sgi575"
+COMPATIBLE_MACHINE:sgi575 = "sgi575"
 
 do_install() {
     install -d ${D}/firmware

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc

@@ -5,7 +5,7 @@ SRCREV = "67a3612716ad3b839da4209a173404692607c5a1"
 PV = "2.8+git${SRCPV}"
 
 # This is incorporated into the SRCREV above
-SRC_URI_remove = " \
+SRC_URI:remove = " \
     file://0001-smt-Make-status-and-length-volatile-for-mod_smt_memo.patch \
     "
 

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.8%.bbappend

@@ -2,9 +2,9 @@
 
 MACHINE_SCP_REQUIRE ?= ""
 
-MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
-MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
-MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
-MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
+MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc"
+MACHINE_SCP_REQUIRE:n1sdp = "scp-firmware-n1sdp.inc"
+MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc"
+MACHINE_SCP_REQUIRE:tc0 = "scp-firmware-tc0.inc"
 
 require ${MACHINE_SCP_REQUIRE}

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone500.inc

@@ -7,7 +7,7 @@ TFA_UBOOT = "1"
 TFA_BUILD_TARGET = "all fip"
 TFA_INSTALL_TARGET = "bl1.bin fip.bin"
 
-EXTRA_OEMAKE_append = " \
+EXTRA_OEMAKE:append = " \
                     ARCH=aarch32 \
                     FVP_HW_CONFIG_DTS=fdts/a5ds.dts \
                     ARM_ARCH_MAJOR=7 \

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone700.inc

@@ -7,7 +7,7 @@ TFA_UBOOT = "1"
 TFA_BUILD_TARGET = "all fip"
 TFA_INSTALL_TARGET = "fip.bin"
 
-EXTRA_OEMAKE_append = " \
+EXTRA_OEMAKE:append = " \
                         ARCH=aarch32 \
                         TARGET_PLATFORM=${TFA_TARGET_PLATFORM} \
                         AARCH32_SP=sp_min \

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc

@@ -5,7 +5,7 @@ TFA_PLATFORM = "fvp"
 TFA_UBOOT = "1"
 TFA_BUILD_TARGET = "dtbs bl1 bl32 fip"
 
-EXTRA_OEMAKE_append = " \
+EXTRA_OEMAKE:append = " \
     ARCH=aarch32 \
     AARCH32_SP=sp_min \
     "

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc

@@ -10,4 +10,4 @@ TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip"
 # Juno needs the System Control Processor Firmware
 DEPENDS += "virtual/control-processor-firmware"
 
-EXTRA_OEMAKE_append = " SCP_BL2=${RECIPE_SYSROOT}/firmware/scp_ramfw.bin"
+EXTRA_OEMAKE:append = " SCP_BL2=${RECIPE_SYSROOT}/firmware/scp_ramfw.bin"

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend

@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/:"
 
 # Don't put machine customisation in here, use a versioned append.

meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.5.bbappend

@@ -1,13 +1,13 @@
 # Machine specific TFAs
 
 MACHINE_TFA_REQUIRE ?= ""
-MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc"
-MACHINE_TFA_REQUIRE_corstone700 = "trusted-firmware-a-corstone700.inc"
-MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
-MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
-MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
-MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
-MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc"
-MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
+MACHINE_TFA_REQUIRE:corstone500 = "trusted-firmware-a-corstone500.inc"
+MACHINE_TFA_REQUIRE:corstone700 = "trusted-firmware-a-corstone700.inc"
+MACHINE_TFA_REQUIRE:fvp-base = "trusted-firmware-a-fvp.inc"
+MACHINE_TFA_REQUIRE:fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
+MACHINE_TFA_REQUIRE:juno = "trusted-firmware-a-juno.inc"
+MACHINE_TFA_REQUIRE:n1sdp = "trusted-firmware-a-n1sdp.inc"
+MACHINE_TFA_REQUIRE:sgi575 = "trusted-firmware-a-sgi575.inc"
+MACHINE_TFA_REQUIRE:tc0 = "trusted-firmware-a-tc0.inc"
 
 require ${MACHINE_TFA_REQUIRE}

meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,13 +1,13 @@
 # Machine specific u-boot
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 #
 # FVP BASE
 #
-SRC_URI_append_fvp-base = " file://bootargs.cfg"
+SRC_URI:append:fvp-base = " file://bootargs.cfg"
 
 #
 # FVP BASE ARM32
 #
-SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch"
+SRC_URI:append:fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch"

meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.04.bbappend

@@ -1,8 +1,8 @@
 #
 # Corstone700 KMACHINE
 #
-FILESEXTRAPATHS_prepend_corstone700 := "${THISDIR}/${BP}/corstone700:"
-SRC_URI_append_corstone700 = " file://0001-arm-Add-corstone700-platform.patch \
+FILESEXTRAPATHS:prepend:corstone700 := "${THISDIR}/${BP}/corstone700:"
+SRC_URI:append:corstone700 = " file://0001-arm-Add-corstone700-platform.patch \
                                file://0002-boot-add-bootx-command-to-start-XiP-images.patch \
                                file://0003-boot-starting-the-XIP-kernel-using-bootx-command.patch \
                                file://0004-arm-enabling-the-arch_timer-driver.patch"

meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend

@@ -1,16 +1,16 @@
 # Machine specific u-boot
 
 THIS_DIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THIS_DIR}/${BP}:"
+FILESEXTRAPATHS:prepend = "${THIS_DIR}/${BP}:"
 
 #
 # Corstone-500 MACHINE
 #
-SRC_URI_append_corstone500 = " \
+SRC_URI:append:corstone500 = " \
                    file://0001-armv7-adding-generic-timer-access-through-MMIO.patch \
                    file://0002-board-arm-add-corstone500-board.patch"
 
 #
 # Juno KMACHINE
 #
-SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
+SRC_URI:append:juno = " file://u-boot_vexpress_uenv.patch"

meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.07.bbappend

@@ -1,12 +1,12 @@
 # Machine specific u-boot
 
 THIS_DIR := "${THISDIR}"
-FILESEXTRAPATHS_prepend = "${THIS_DIR}/${BP}:"
+FILESEXTRAPATHS:prepend = "${THIS_DIR}/${BP}:"
 
 #
 # TC0 MACHINE
 #
-SRC_URI_append_tc0 = " \
+SRC_URI:append:tc0 = " \
     file://0001-board-armltd-Remove-bootargs-from-Total-Compute-conf.patch \
     file://0002-cmd-part-Correct-error-handling.patch \
     file://bootargs.cfg \

meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc

@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://Add-mem-regions-to-support.patch;patchdir=${S}/edk2-platforms \
+SRC_URI:append = " file://Add-mem-regions-to-support.patch;patchdir=${S}/edk2-platforms \
                    file://Introduce-platform-DXE-driver.patch;patchdir=${S}/edk2-platforms \
                    file://Enable-N1SDP-platform-specific-configs.patch;patchdir=${S}/edk2-platforms \
                    file://Configuration-Manager-for-N1SDP.patch;patchdir=${S}/edk2-platforms "
@@ -19,7 +19,7 @@ COMPATIBLE_MACHINE = "n1sdp"
 EFIDIR             = "/EFI/BOOT"
 EFI_BOOT_IMAGE     = "bootaa64.efi"
 
-do_deploy_append() {
+do_deploy:append() {
     EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
     printf 'FS2:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}" > ${DEPLOYDIR}/startup.nsh
 }

meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202102.bbappend

@@ -2,8 +2,8 @@
 
 MACHINE_EDK2_REQUIRE ?= ""
 
-MACHINE_EDK2_REQUIRE_fvp-base = "edk2-firmware-fvp-base.inc"
-MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc"
-MACHINE_EDK2_REQUIRE_n1sdp = "edk2-firmware-n1sdp.inc"
+MACHINE_EDK2_REQUIRE:fvp-base = "edk2-firmware-fvp-base.inc"
+MACHINE_EDK2_REQUIRE:sgi575 = "edk2-firmware-sgi575.inc"
+MACHINE_EDK2_REQUIRE:n1sdp = "edk2-firmware-n1sdp.inc"
 
 require ${MACHINE_EDK2_REQUIRE}

meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend

@@ -5,4 +5,4 @@
 #
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc

@@ -13,43 +13,43 @@ ARMBSPFILESPATHS := "${THISDIR}:${THISDIR}/files:"
 
 # Arm platforms kmeta
 SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta"
-SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}"
-SRC_URI_append_fvp-base-arm32 = " ${SRC_URI_KMETA}"
-SRC_URI_append_juno = " ${SRC_URI_KMETA}"
-SRC_URI_append_n1sdp = " ${SRC_URI_KMETA}"
-SRC_URI_append_fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}"
-SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
+SRC_URI:append:fvp-base = " ${SRC_URI_KMETA}"
+SRC_URI:append:fvp-base-arm32 = " ${SRC_URI_KMETA}"
+SRC_URI:append:juno = " ${SRC_URI_KMETA}"
+SRC_URI:append:n1sdp = " ${SRC_URI_KMETA}"
+SRC_URI:append:fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}"
+SRCREV:arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
 
 #
 # Corstone-500 KMACHINE
 #
-COMPATIBLE_MACHINE_corstone500 = "corstone500"
+COMPATIBLE_MACHINE:corstone500 = "corstone500"
 
 #
 # FVP BASE KMACHINE
 #
-COMPATIBLE_MACHINE_fvp-base = "fvp-base"
-KMACHINE_fvp-base = "fvp"
-FILESEXTRAPATHS_prepend_fvp-base := "${ARMBSPFILESPATHS}"
+COMPATIBLE_MACHINE:fvp-base = "fvp-base"
+KMACHINE:fvp-base = "fvp"
+FILESEXTRAPATHS:prepend:fvp-base := "${ARMBSPFILESPATHS}"
 
 #
 # FVP BASE ARM32 KMACHINE
 #
-COMPATIBLE_MACHINE_fvp-base-arm32 = "fvp-base-arm32"
-KMACHINE_fvp-base-arm32 = "fvp-arm32"
-FILESEXTRAPATHS_prepend_fvp-base-arm32 := "${ARMBSPFILESPATHS}"
-SRC_URI_append_fvp-base-arm32 = " file://fvp-base-arm32-dts.patch \
+COMPATIBLE_MACHINE:fvp-base-arm32 = "fvp-base-arm32"
+KMACHINE:fvp-base-arm32 = "fvp-arm32"
+FILESEXTRAPATHS:prepend:fvp-base-arm32 := "${ARMBSPFILESPATHS}"
+SRC_URI:append:fvp-base-arm32 = " file://fvp-base-arm32-dts.patch \
                                   file://0001-ARM-vexpress-enable-GICv3.patch"
 
 #
 # Juno KMACHINE
 #
-COMPATIBLE_MACHINE_juno = "juno"
-KMACHINE_juno = "juno"
-KBUILD_DEFCONFIG_juno = "defconfig"
-KCONFIG_MODE_juno = "--alldefconfig"
-FILESEXTRAPATHS_prepend_juno := "${ARMBSPFILESPATHS}"
-SRC_URI_append_juno = " \
+COMPATIBLE_MACHINE:juno = "juno"
+KMACHINE:juno = "juno"
+KBUILD_DEFCONFIG:juno = "defconfig"
+KCONFIG_MODE:juno = "--alldefconfig"
+FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}"
+SRC_URI:append:juno = " \
     file://0001-mailbox-add-support-for-doorbell-signal-mode-control.patch \
     file://0002-dt-bindings-mailbox-add-bindings-to-support-ARM-MHU-.patch \
     file://0003-mailbox-arm_mhu-migrate-to-threaded-irq-handler.patch \
@@ -63,19 +63,19 @@ SRC_URI_append_juno = " \
 #
 # SGI575 KMACHINE
 #
-COMPATIBLE_MACHINE_sgi575 = "sgi575"
-KMACHINE_sgi575 = "sgi575"
-KBUILD_DEFCONFIG_sgi575 = "defconfig"
-KCONFIG_MODE_sgi575 = "--alldefconfig"
+COMPATIBLE_MACHINE:sgi575 = "sgi575"
+KMACHINE:sgi575 = "sgi575"
+KBUILD_DEFCONFIG:sgi575 = "defconfig"
+KCONFIG_MODE:sgi575 = "--alldefconfig"
 
 #
 # Total Compute KMACHINE
 #
-COMPATIBLE_MACHINE_tc0 = "tc0"
-KMACHINE_tc0 = "tc0"
-KCONFIG_MODE_tc0 = "--alldefconfig"
-FILESEXTRAPATHS_prepend_tc0 := "${ARMBSPFILESPATHS}"
-SRC_URI_append_tc0 = " \
+COMPATIBLE_MACHINE:tc0 = "tc0"
+KMACHINE:tc0 = "tc0"
+KCONFIG_MODE:tc0 = "--alldefconfig"
+FILESEXTRAPATHS:prepend:tc0 := "${ARMBSPFILESPATHS}"
+SRC_URI:append:tc0 = " \
     file://defconfig \
     file://0001-drm-Add-component-aware-simple-encoder.patch \
     file://0002-drm-arm-komeda-add-RENDER-capability-to-the-device-n.patch \
@@ -103,12 +103,12 @@ SRC_URI_append_tc0 = " \
 #
 # N1SDP KMACHINE
 #
-FILESEXTRAPATHS_prepend_n1sdp := "${THISDIR}/linux-yocto-5.10/n1sdp:"
-COMPATIBLE_MACHINE_n1sdp = "n1sdp"
-KBUILD_DEFCONFIG_n1sdp = "defconfig"
-KCONFIG_MODE_n1sdp = "--alldefconfig"
-FILESEXTRAPATHS_prepend_n1sdp := "${ARMBSPFILESPATHS}"
-SRC_URI_append_n1sdp = " \
+FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-5.10/n1sdp:"
+COMPATIBLE_MACHINE:n1sdp = "n1sdp"
+KBUILD_DEFCONFIG:n1sdp = "defconfig"
+KCONFIG_MODE:n1sdp = "--alldefconfig"
+FILESEXTRAPATHS:prepend:n1sdp := "${ARMBSPFILESPATHS}"
+SRC_URI:append:n1sdp = " \
     file://0001-pci_quirk-add-acs-override-for-PCI-devices.patch \
     file://0002-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch \
     file://0003-n1sdp-update-n1sdp-pci-quirk-for-SR-IOV-support.patch \
@@ -121,17 +121,17 @@ SRC_URI_append_n1sdp = " \
     "
 # Since we use the intree defconfig and the preempt-rt turns off some configs
 # do_kernel_configcheck will display warnings. So, lets disable it.
-KCONF_AUDIT_LEVEL_n1sdp_pn-linux-yocto-rt = "0"
+KCONF_AUDIT_LEVEL:n1sdp:pn-linux-yocto-rt = "0"
 
 #
 # Musca B1/S2 can't run Linux
 #
-COMPATIBLE_MACHINE_musca-b1 = "(^$)"
-COMPATIBLE_MACHINE_musca-s1 = "(^$)"
+COMPATIBLE_MACHINE:musca-b1 = "(^$)"
+COMPATIBLE_MACHINE:musca-s1 = "(^$)"
 
 #
 # FVP BaseR AEMv8r64 Machine
 #
-COMPATIBLE_MACHINE_fvp-baser-aemv8r64 = "fvp-baser-aemv8r64"
-FILESEXTRAPATHS_prepend_fvp-baser-aemv8r64 := "${ARMBSPFILESPATHS}"
-SRC_URI_append_fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/arch/arm64/boot/dts/arm"
+COMPATIBLE_MACHINE:fvp-baser-aemv8r64 = "fvp-baser-aemv8r64"
+FILESEXTRAPATHS:prepend:fvp-baser-aemv8r64 := "${ARMBSPFILESPATHS}"
+SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/arch/arm64/boot/dts/arm"

meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.10.bbappend

@@ -1,5 +1,5 @@
 # Machine specific configurations
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:"
 
 require linux-arm-platforms.inc

meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:"
 
 COMPATIBLE_MACHINE = "${MACHINE}"
 
@@ -31,12 +31,12 @@ KERNEL_IMAGETYPE = "xipImage"
 
 KCONFIG_MODE = "--alldefconfig"
 
-SRC_URI_append = " ${SRC_URI_KMETA}"
+SRC_URI:append = " ${SRC_URI_KMETA}"
 
 KERNEL_EXTRA_FEATURES = "bsp/arm-platforms/corstone700-bsp.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
 
-KERNEL_FEATURES_append_corstone700-fvp = " \
+KERNEL_FEATURES:append:corstone700-fvp = " \
     ${@bb.utils.contains('MACHINE_FEATURES', \
                          'eth_lan91c111', \
                          'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \
@@ -44,7 +44,7 @@ KERNEL_FEATURES_append_corstone700-fvp = " \
                          'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \
                           d)}"
 
-KERNEL_FEATURES_append_corstone700-mps3 = " \
+KERNEL_FEATURES:append:corstone700-mps3 = " \
     ${@bb.utils.contains('MACHINE_FEATURES', \
                          'eth_lan9115', \
                          'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \

meta-arm-bsp/recipes-kernel/linux/linux-yocto-rt_%.bbappend

@@ -1,6 +1,6 @@
 # Only enable linux-yocto-rt for n1sdp and the Armv8-R AArch64 AEM FVP
 LINUX_YOCTO_RT_REQUIRE ?= ""
-LINUX_YOCTO_RT_REQUIRE_n1sdp = "linux-arm-platforms.inc"
-LINUX_YOCTO_RT_REQUIRE_fvp-baser-aemv8r64 = "linux-arm-platforms.inc"
+LINUX_YOCTO_RT_REQUIRE:n1sdp = "linux-arm-platforms.inc"
+LINUX_YOCTO_RT_REQUIRE:fvp-baser-aemv8r64 = "linux-arm-platforms.inc"
 
 require ${LINUX_YOCTO_RT_REQUIRE}

meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3%.bbappend

@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.3:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.3:"
 
-SRC_URI_append = " file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
+SRC_URI:append = " file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
                    file://0002-perf-tests-bp_account-Make-global-variable-static.patch \
                    file://0003-perf-bench-Share-some-global-variables-to-fix-build-.patch \
                    file://0004-libtraceevent-Fix-build-with-binutils-2.35.patch \

meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend

@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.6:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.6:"
 
-SRC_URI_append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
+SRC_URI:append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
                    file://0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch"
 
 #
 # Corstone700 KMACHINE
 #
 MACHINE_KERNEL_REQUIRE ?= ""
-MACHINE_KERNEL_REQUIRE_corstone700 = "linux-yocto-corstone700.inc"
+MACHINE_KERNEL_REQUIRE:corstone700 = "linux-yocto-corstone700.inc"
 
 require ${MACHINE_KERNEL_REQUIRE}

meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7%.bbappend

@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-5.7:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.7:"
 
-SRC_URI_append = " file://coresight-traceid.patch \
+SRC_URI:append = " file://coresight-traceid.patch \
                    file://defconfig.patch \
                  "

meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend

@@ -1,6 +1,6 @@
 # Machine specific configurations
 
 MACHINE_OPTEE_CLIENT_REQUIRE ?= ""
-MACHINE_OPTEE_CLIENT_REQUIRE_tc0 = "optee-client-tc0.inc"
+MACHINE_OPTEE_CLIENT_REQUIRE:tc0 = "optee-client-tc0.inc"
 
 require ${MACHINE_OPTEE_CLIENT_REQUIRE}

meta-arm-bsp/recipes-security/optee/optee-os-tc0.inc

@@ -5,8 +5,8 @@
 SRCREV = "49dbb9ef65643c4322cf3f848910fa880d1c02f6"
 PV = "3.14.0+git${SRCPV}"
 
-FILESEXTRAPATHS_prepend_tc0 := "${THISDIR}/files/optee-os/tc0:"
-SRC_URI_append = " \
+FILESEXTRAPATHS:prepend:tc0 := "${THISDIR}/files/optee-os/tc0:"
+SRC_URI:append = " \
     file://sp_layout.json \
     file://0001-WIP-Enable-managed-exit.patch \
     "
@@ -27,7 +27,7 @@ EXTRA_OEMAKE += " CFG_WITH_STATS=y"
 EXTRA_OEMAKE += " CFG_CORE_SEL2_SPMC=y"
 
 # Copy optee manifest file
-do_install_append() {
+do_install:append() {
     install -d ${D}${nonarch_base_libdir}/firmware/
     install -m 644 ${WORKDIR}/sp_layout.json ${D}${nonarch_base_libdir}/firmware/
     install -m 644 \

meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend

@@ -1,6 +1,6 @@
 # Machine specific configurations
 
 MACHINE_OPTEE_OS_REQUIRE ?= ""
-MACHINE_OPTEE_OS_REQUIRE_tc0 = "optee-os-tc0.inc"
+MACHINE_OPTEE_OS_REQUIRE:tc0 = "optee-os-tc0.inc"
 
 require ${MACHINE_OPTEE_OS_REQUIRE}