meta-arm: Convert to new override syntax

Signed-off-by: Jon Mason <jon.mason@arm.com>
2026-07-26 19:17:05 +00:00 · 2021-08-04 12:13:49 -04:00
parent 3899adac99
commit 8dfdacd75c
149 changed files with 718 additions and 718 deletions
@@ -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 )
 }
@@ -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}"
@@ -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
@@ -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"
@@ -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)}"
@@ -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
@@ -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 \
@@ -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}
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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

@@ -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 \
@@ -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"
@@ -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/" \
@@ -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
@@ -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"
@@ -1,4 +1,4 @@
-PACKAGECONFIG_remove = "\
+PACKAGECONFIG:remove = "\
    ${@bb.utils.contains('DISTRO_FEATURES', \
                         'arm-autonomy-host', \
                         'sdl', '', d)}"
@@ -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"
@@ -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"
@@ -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 \
    "
@@ -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
@@ -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
@@ -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"
@@ -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"

@@ -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"
@@ -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', \