meta-arm: Convert to new override syntax

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

meta-gem5/conf/layer.conf

@@ -16,4 +16,4 @@ BBFILES_DYNAMIC += " \
     virtualization-layer:${LAYERDIR}/dynamic-layers/meta-virtualization/*/*/*.bbappend \
 "
 
-DISTRO_FEATURES_NATIVE_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'xen', d)}"
+DISTRO_FEATURES_NATIVE:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'xen', d)}"

meta-gem5/conf/machine/gem5-arm64.conf

@@ -50,5 +50,5 @@ EXTRA_IMAGEDEPENDS += "gem5-aarch64-native"
 # 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-gem5/dynamic-layers/meta-virtualization/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend

@@ -1,6 +1,6 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ...
-OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"
+OVERRIDES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"
 
 # Xen image to put in the image
 # This should point to a file in the deploy image directory
@@ -9,21 +9,21 @@ BOOT_WRAPPER_AARCH64_XEN ??= "xen-${MACHINE}"
 # Xen command line for the image
 BOOT_WRAPPER_AARCH64_XEN_CMDLINE ??= "noreboot dom0_mem=256M"
 
-BOOT_WRAPPER_AARCH64_XEN_CMDLINE_gem5-arm64 = "noreboot dom0_mem=256M console=dtuart \
+BOOT_WRAPPER_AARCH64_XEN_CMDLINE:gem5-arm64 = "noreboot dom0_mem=256M console=dtuart \
     dtuart=/uart@1c090000 bootscrub=0"
 
 # Fix command line in the axf file for gem5-arm64 when Xen is present
-BOOT_WRAPPER_AARCH64_CMDLINE_xen_gem5-arm64 = "console=hvc0 root=/dev/vda rw"
+BOOT_WRAPPER_AARCH64_CMDLINE_xen:gem5-arm64 = "console=hvc0 root=/dev/vda rw"
 
 # Image generated by boot wrapper when Xen is present
 BOOT_WRAPPER_AARCH64_IMAGE_xen ?= "xen-system.axf"
 
-EXTRA_OECONF_append_xen = " \
+EXTRA_OECONF:append:xen = " \
 --with-xen=${WORKDIR}/kernel/arch/arm64/boot/Image \
 --with-xen-cmdline="" \
 "
 
-EXTRA_OEMAKE_append_xen = " \
+EXTRA_OEMAKE:append:xen = " \
 XEN_IMAGE=${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_XEN} \
 XEN_CMDLINE="${BOOT_WRAPPER_AARCH64_XEN_CMDLINE}" \
 "

meta-gem5/dynamic-layers/meta-virtualization/recipes-devtools/gem5/gem5-aarch64-native_20.bbappend

@@ -1,6 +1,6 @@
 # When booting gem5-arm64 with Xen we need to set the cpu as Cortex A53 and
 # remove support for pointer authentification
-GEM5_RUN_EXTRA_append = " \
+GEM5_RUN_EXTRA:append = " \
 ${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'xen', \
 '--param=system.cpu_cluster[0].cpus[0].isa[0].midr=0x410fd030 \
 --param=system.cpu_cluster[0].cpus[0].isa[0].id_aa64isar1_el1=0x0', \

meta-gem5/dynamic-layers/meta-virtualization/recipes-extended/xen/xen_%.bbappend

@@ -1,4 +1,4 @@
 # gem5-arm64 support
-COMPATIBLE_MACHINE_gem5-arm64 = "gem5-arm64"
-FILESEXTRAPATHS_prepend_gem5-arm64 := "${THISDIR}/files:"
-SRC_URI_append_gem5-arm64 = " file://early-printk.cfg"
+COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
+FILESEXTRAPATHS:prepend:gem5-arm64 := "${THISDIR}/files:"
+SRC_URI:append:gem5-arm64 = " file://early-printk.cfg"

meta-gem5/dynamic-layers/meta-virtualization/recipes-kernel/linux/linux-%.bbappend

@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend_gem5-arm64 := "${THISDIR}:"
+FILESEXTRAPATHS:prepend:gem5-arm64 := "${THISDIR}:"
 
 #
 # virtualization kmeta extra
 #
-SRC_URI_append_gem5-arm64 = " file://virtualization-kmeta-extra-gem5;type=kmeta;name=virtualization-kmeta-extra-gem5;destsuffix=virtualization-kmeta-extra-gem5"
+SRC_URI:append:gem5-arm64 = " file://virtualization-kmeta-extra-gem5;type=kmeta;name=virtualization-kmeta-extra-gem5;destsuffix=virtualization-kmeta-extra-gem5"
 
 # We need to turn off SVE support in the Linux kernel otherwise Xen is stopping
 # Linux kernel with a coredump while trying to access XEN bit of CPACR1 core
 # register.
-LINUX_VIRTUALIZATION_DISABLE_ARM64_SVE_gem5-arm64 = "${@bb.utils.contains('DISTRO_FEATURES', \
+LINUX_VIRTUALIZATION_DISABLE_ARM64_SVE:gem5-arm64 = "${@bb.utils.contains('DISTRO_FEATURES', \
                                          'xen', ' features/disable-arm64-sve.scc','',d)}"
 
-KERNEL_FEATURES_append_gem5-arm64 = "${LINUX_VIRTUALIZATION_DISABLE_ARM64_SVE}"
+KERNEL_FEATURES:append:gem5-arm64 = "${LINUX_VIRTUALIZATION_DISABLE_ARM64_SVE}"

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

@@ -1,13 +1,13 @@
 # Gem5 aarch64 support
-COMPATIBLE_MACHINE_gem5-arm64 = "gem5-arm64"
+COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
 
-PROVIDES_gem5-arm64 += "virtual/gem5-bootloader"
+PROVIDES:gem5-arm64 += "virtual/gem5-bootloader"
 
 # For gem5 we use the dtb generated by gem5 directly
-DEPENDS_append_gem5-arm64 = " gem5-aarch64-dtb"
-BOOT_WRAPPER_AARCH64_DEVICETREE_gem5-arm64 = "gem5-aarch64.dtb"
+DEPENDS:append:gem5-arm64 = " gem5-aarch64-dtb"
+BOOT_WRAPPER_AARCH64_DEVICETREE:gem5-arm64 = "gem5-aarch64.dtb"
 
 # The dtb must be generated for us to generate the axf
 DEPLOY_DEPEND_LIST ?= ""
-DEPLOY_DEPEND_LIST_gem5-arm64 = " gem5-aarch64-dtb:do_deploy"
+DEPLOY_DEPEND_LIST:gem5-arm64 = " gem5-aarch64-dtb:do_deploy"
 do_deploy[depends] += "${DEPLOY_DEPEND_LIST}"

meta-gem5/recipes-devtools/gem5/gem5-aarch64-native_20.bb

@@ -8,13 +8,13 @@ require gem5-aarch64-native.inc
 require gem5-native.inc
 
 # Get rid of compiler errors when building protobuf
-GEM5_SCONS_ARGS_append = " CCFLAGS_EXTRA='-Wno-error=unused-variable' --verbose"
+GEM5_SCONS_ARGS:append = " CCFLAGS_EXTRA='-Wno-error=unused-variable' --verbose"
 
 # Get rid of linker errors and have a faster link process
-GEM5_SCONS_ARGS_append = " LDFLAGS_EXTRA='${BUILD_LDFLAGS}' \
+GEM5_SCONS_ARGS:append = " LDFLAGS_EXTRA='${BUILD_LDFLAGS}' \
 MARSHAL_LDFLAGS_EXTRA='${BUILD_LDFLAGS}' --force-lto "
 
-do_compile_prepend() {
+do_compile:prepend() {
     # Gem5 expect to have python in the path (can be python2 or 3)
     # Create a link named python to python3
     real=$(which ${PYTHON})

meta-gem5/recipes-devtools/gem5/gem5-native.inc

@@ -45,8 +45,8 @@ do_install() {
     done
 }
 
-FILES_${PN} = "${datadir}/gem5/* ${bindir}/*"
-INSANE_SKIP_${PN} += "already-stripped"
-RDEPENDS_${PN} += "python3-native hdf5-native protobuf-native libpng-native"
+FILES:${PN} = "${datadir}/gem5/* ${bindir}/*"
+INSANE_SKIP:${PN} += "already-stripped"
+RDEPENDS:${PN} += "python3-native hdf5-native protobuf-native libpng-native"
 
 addtask addto_recipe_sysroot before do_build

meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend

@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:"
 
-COMPATIBLE_MACHINE_gem5-arm64 = "gem5-arm64"
-KMACHINE_gem5-arm64 = "gem5-arm64"
-SRC_URI_append_gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \
+COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
+KMACHINE:gem5-arm64 = "gem5-arm64"
+SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \
                               file://dts/gem5-arm64;subdir=add-files"
 
-do_patch_append_gem5-arm64() {
+do_patch:append:gem5-arm64() {
     tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \
         tar -C arch/arm64/boot/dts -xf -
 }