Merge pull request #816 from shr-project/jansa/master

Convert to new override syntax

61 files changed, 225 insertions, 225 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 68fb563..efc5bcf 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -14,15 +14,15 @@ BUILD_OSTREE_TARBALL ??= "1"
 SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}"
 
 IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
-CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]"
-CONVERSIONTYPES_append = " tar"
+CONVERSION_CMD:tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]"
+CONVERSIONTYPES:append = " tar"
 
-TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}"
+TAR_IMAGE_ROOTFS:task-image-ostree = "${OSTREE_ROOTFS}"
 
 do_image_ostree[dirs] = "${OSTREE_ROOTFS}"
 do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"
 do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete"
-IMAGE_CMD_ostree () {
+IMAGE_CMD:ostree () {
     # Copy required as we change permissions on some files.
     tar --xattrs --xattrs-include='*' -cf - -S -C ${IMAGE_ROOTFS} -p . | tar --xattrs --xattrs-include='*' -xf - -C ${OSTREE_ROOTFS}
 
@@ -126,10 +126,10 @@ IMAGE_CMD_ostree () {
     cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
 }
 
-IMAGE_TYPEDEP_ostreecommit = "ostree"
+IMAGE_TYPEDEP:ostreecommit = "ostree"
 do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot"
 do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock"
-IMAGE_CMD_ostreecommit () {
+IMAGE_CMD:ostreecommit () {
     if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then
         ostree --repo=${OSTREE_REPO} init --mode=archive-z2
     fi
@@ -151,10 +151,10 @@ IMAGE_CMD_ostreecommit () {
     fi
 }
 
-IMAGE_TYPEDEP_ostreepush = "ostreecommit"
+IMAGE_TYPEDEP:ostreepush = "ostreecommit"
 do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot"
 do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock"
-IMAGE_CMD_ostreepush () {
+IMAGE_CMD:ostreepush () {
     # send a copy of the repo manifest to backend if available
     local SEND_MANIFEST=""
     # check if garage-push supports the --repo-manifest option before trying
@@ -177,12 +177,12 @@ IMAGE_CMD_ostreepush () {
     fi
 }
 
-IMAGE_TYPEDEP_garagesign = "ostreepush"
+IMAGE_TYPEDEP:garagesign = "ostreepush"
 do_image_garagesign[depends] += "unzip-native:do_populate_sysroot"
 # This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using
 # garage-sign simultaneously for two images often causes problems.
 do_image_garagesign[lockfiles] += "${DEPLOY_DIR_IMAGE}/garagesign.lock"
-IMAGE_CMD_garagesign () {
+IMAGE_CMD:garagesign () {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         # if credentials are issued by a server that doesn't support offline signing, exit silently
         unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0
@@ -269,8 +269,8 @@ IMAGE_CMD_garagesign () {
     fi
 }
 
-IMAGE_TYPEDEP_garagecheck = "garagesign"
-IMAGE_CMD_garagecheck () {
+IMAGE_TYPEDEP:garagecheck = "garagesign"
+IMAGE_CMD:garagecheck () {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         # if credentials are issued by a server that doesn't support offline signing, exit silently
         unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 8af6637..02c5e99 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -1,11 +1,11 @@
 OTA_SYSROOT = "${WORKDIR}/ota-sysroot"
-TAR_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}"
-IMAGE_TYPEDEP_ota = "ostreecommit"
+TAR_IMAGE_ROOTFS:task-image-ota = "${OTA_SYSROOT}"
+IMAGE_TYPEDEP:ota = "ostreecommit"
 do_image_ota[dirs] = "${OTA_SYSROOT}"
 do_image_ota[cleandirs] = "${OTA_SYSROOT}"
 do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \
                          ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}"
-IMAGE_CMD_ota () {
+IMAGE_CMD:ota () {
         ostree admin --sysroot=${OTA_SYSROOT} init-fs --modern ${OTA_SYSROOT}
         ostree admin --sysroot=${OTA_SYSROOT} os-init ${OSTREE_OSNAME}
 
@@ -77,10 +77,10 @@ IMAGE_CMD_ota () {
         echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions
 }
 
-EXTRA_IMAGECMD_ota-ext4 = "-L otaroot -i 4096 -t ext4"
-IMAGE_TYPEDEP_ota-ext4 = "ota"
-IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}"
-IMAGE_CMD_ota-ext4 () {
+EXTRA_IMAGECMD:ota-ext4 = "-L otaroot -i 4096 -t ext4"
+IMAGE_TYPEDEP:ota-ext4 = "ota"
+IMAGE_ROOTFS:task-image-ota-ext4 = "${OTA_SYSROOT}"
+IMAGE_CMD:ota-ext4 () {
         ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4
         ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ota-ext4
         oe_mkext234fs ota-ext4 ${EXTRA_IMAGECMD}
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index a331fa4..9eccdcd 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -5,7 +5,7 @@ SOTA_DEPLOY_CREDENTIALS ?= "1"
 SOTA_HARDWARE_ID ??= "${MACHINE}"
 
 IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest"
-IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \
+IMAGE_INSTALL:append:sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \
                               ostree os-release ostree-kernel ostree-initramfs \
                               ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}"
 
@@ -13,12 +13,12 @@ IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush ga
 IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota.tar.xz', ' ', d)}"
 
-PACKAGECONFIG_append_pn-curl = " ssl"
-PACKAGECONFIG_remove_pn-curl = "gnutls"
+PACKAGECONFIG:append:pn-curl = " ssl"
+PACKAGECONFIG:remove:pn-curl = "gnutls"
 
-WKS_FILE_sota ?= "sdimage-sota.wks"
+WKS_FILE:sota ?= "sdimage-sota.wks"
 
-EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native"
+EXTRA_IMAGEDEPENDS:append:sota = " parted-native mtools-native dosfstools-native"
 
 INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}"
 
@@ -46,13 +46,13 @@ GARAGE_TARGET_EXPIRE_AFTER ?= ""
 GARAGE_CUSTOMIZE_TARGET ?= ""
 
 SOTA_MACHINE ??="none"
-SOTA_MACHINE_rpi ?= "raspberrypi"
-SOTA_MACHINE_porter ?= "porter"
-SOTA_MACHINE_m3ulcb = "m3ulcb"
-SOTA_MACHINE_intel-corei7-64 ?= "minnowboard"
-SOTA_MACHINE_qemux86-64 ?= "qemux86-64"
-SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
-SOTA_MACHINE_freedom-u540 ?= "freedom-u540"
+SOTA_MACHINE:rpi ?= "raspberrypi"
+SOTA_MACHINE:porter ?= "porter"
+SOTA_MACHINE:m3ulcb = "m3ulcb"
+SOTA_MACHINE:intel-corei7-64 ?= "minnowboard"
+SOTA_MACHINE:qemux86-64 ?= "qemux86-64"
+SOTA_MACHINE:am335x-evm ?= "am335x-evm-wifi"
+SOTA_MACHINE:freedom-u540 ?= "freedom-u540"
 
 SOTA_OVERRIDES_BLACKLIST = "ostree ota"
 SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME"
diff --git a/classes/sota_am335x-evm-wifi.bbclass b/classes/sota_am335x-evm-wifi.bbclass
index 1458d44..724a8d0 100644
--- a/classes/sota_am335x-evm-wifi.bbclass
+++ b/classes/sota_am335x-evm-wifi.bbclass
@@ -1,15 +1,15 @@
-KERNEL_IMAGETYPE_sota = "uImage"
+KERNEL_IMAGETYPE:sota = "uImage"
 
 OSTREE_BOOTLOADER ?= "u-boot"
 
-EXTRA_IMAGEDEPENDS_append_sota = " acer-bootfiles"
-IMAGE_BOOT_FILES_sota = "bootfiles/*"
+EXTRA_IMAGEDEPENDS:append:sota = " acer-bootfiles"
+IMAGE_BOOT_FILES:sota = "bootfiles/*"
 OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l"
 
-IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant"
+IMAGE_INSTALL:append:sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant"
 
-PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f"
+PREFERRED_VERSION_linux-ti-staging:sota = "4.4.54+gitAUTOINC+ecd4eada6f"
 
-KERNEL_EXTRA_ARGS_append_sota = " LOADADDR=${UBOOT_ENTRYPOINT}"
+KERNEL_EXTRA_ARGS:append:sota = " LOADADDR=${UBOOT_ENTRYPOINT}"
 
-VIRTUAL-RUNTIME_net_manager_sota = "systemd"
+VIRTUAL-RUNTIME_net_manager:sota = "systemd"
diff --git a/classes/sota_bleeding.inc b/classes/sota_bleeding.inc
index 77d004b..f70e8b7 100644
--- a/classes/sota_bleeding.inc
+++ b/classes/sota_bleeding.inc
@@ -1,2 +1,2 @@
-SRCREV_pn-aktualizr ?= "${AUTOREV}"
-SRCREV_pn-aktualizr-native ?= "${AUTOREV}"
+SRCREV:pn-aktualizr ?= "${AUTOREV}"
+SRCREV:pn-aktualizr-native ?= "${AUTOREV}"
diff --git a/classes/sota_freedom-u540.bbclass b/classes/sota_freedom-u540.bbclass
index c287154..8759b2b 100644
--- a/classes/sota_freedom-u540.bbclass
+++ b/classes/sota_freedom-u540.bbclass
@@ -5,8 +5,8 @@ INITRAMFS_FSTYPES = "cpio.gz"
 PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"
 
 IMAGE_BOOT_FILES += "uEnv.txt"
-IMAGE_BOOT_FILES_remove = "fitImage"
+IMAGE_BOOT_FILES:remove = "fitImage"
 
-OSTREE_KERNEL_ARGS_sota ?= "earlycon=sbi console=ttySIF0 ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p3"
+OSTREE_KERNEL_ARGS:sota ?= "earlycon=sbi console=ttySIF0 ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p3"
 
-WKS_FILE_sota = "freedom-u540-opensbi-sota.wks"
+WKS_FILE:sota = "freedom-u540-opensbi-sota.wks"
diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass
index 7ea273d..521ce24 100644
--- a/classes/sota_m3ulcb.bbclass
+++ b/classes/sota_m3ulcb.bbclass
@@ -1,12 +1,12 @@
 # Commit united image to OSTree, not just uImage
 OSTREE_KERNEL = "Image"
 
-EXTRA_IMAGEDEPENDS_append_sota = " renesas-ota-bootfiles"
-IMAGE_BOOT_FILES_sota += "renesas-ota-bootfiles/*"
+EXTRA_IMAGEDEPENDS:append:sota = " renesas-ota-bootfiles"
+IMAGE_BOOT_FILES:sota += "renesas-ota-bootfiles/*"
 
 OSTREE_BOOTLOADER ?= "u-boot"
 
-UBOOT_MACHINE_sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig"
+UBOOT_MACHINE:sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig"
 
 PREFERRED_RPROVIDER_network-configuration ?= "connman"
-IMAGE_INSTALL_append_sota = " network-configuration "
+IMAGE_INSTALL:append:sota = " network-configuration "
diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass
index 3128965..57230a2 100644
--- a/classes/sota_minnowboard.bbclass
+++ b/classes/sota_minnowboard.bbclass
@@ -1,12 +1,12 @@
 OSTREE_BOOTLOADER ?= "grub"
-EFI_PROVIDER_sota = "grub-efi"
+EFI_PROVIDER:sota = "grub-efi"
 
-WKS_FILE_sota = "efiimage-sota.wks"
-IMAGE_BOOT_FILES_sota = ""
+WKS_FILE:sota = "efiimage-sota.wks"
+IMAGE_BOOT_FILES:sota = ""
 
-IMAGE_FSTYPES_remove_sota = "live hddimg"
+IMAGE_FSTYPES:remove:sota = "live hddimg"
 OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0"
-IMAGE_INSTALL_append = " minnowboard-efi-startup"
+IMAGE_INSTALL:append = " minnowboard-efi-startup"
 
 PREFERRED_RPROVIDER_network-configuration ?= "connman"
-IMAGE_INSTALL_append_sota = " network-configuration "
+IMAGE_INSTALL:append:sota = " network-configuration "
diff --git a/classes/sota_porter.bbclass b/classes/sota_porter.bbclass
index 6c6fe70..ffefecb 100644
--- a/classes/sota_porter.bbclass
+++ b/classes/sota_porter.bbclass
@@ -1,11 +1,11 @@
 # Commit united image to OSTree, not just uImage
 OSTREE_KERNEL = "uImage+dtb"
 
-EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles"
-IMAGE_BOOT_FILES_sota += "porter-bootfiles/*"
+EXTRA_IMAGEDEPENDS:append:sota = " porter-bootfiles"
+IMAGE_BOOT_FILES:sota += "porter-bootfiles/*"
 
 OSTREE_BOOTLOADER ?= "u-boot"
-UBOOT_MACHINE_sota = "porter_config"
+UBOOT_MACHINE:sota = "porter_config"
 
 PREFERRED_RPROVIDER_network-configuration ?= "connman"
-IMAGE_INSTALL_append_sota = " network-configuration "
+IMAGE_INSTALL:append:sota = " network-configuration "
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass
index 3dc2428..6cfe611 100644
--- a/classes/sota_qemux86-64.bbclass
+++ b/classes/sota_qemux86-64.bbclass
@@ -1,8 +1,8 @@
-IMAGE_FSTYPES_remove = "wic"
+IMAGE_FSTYPES:remove = "wic"
 
 # U-Boot support for SOTA
 PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
-UBOOT_MACHINE_sota = "qemu-x86_defconfig"
+UBOOT_MACHINE:sota = "qemu-x86_defconfig"
 OSTREE_BOOTLOADER ?= "u-boot"
 INITRAMFS_FSTYPES ?= "cpio.gz"
 
@@ -13,4 +13,4 @@ IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '655
 # fix for u-boot/swig build issue
 HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc"
 
-IMAGE_INSTALL_append_sota = " network-configuration "
+IMAGE_INSTALL:append:sota = " network-configuration "
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass
index 3935ba8..c36dc51 100644
--- a/classes/sota_raspberrypi.bbclass
+++ b/classes/sota_raspberrypi.bbclass
@@ -1,7 +1,7 @@
-RPI_USE_U_BOOT_sota = "1"
+RPI_USE_U_BOOT:sota = "1"
 
-KERNEL_CLASSES_append_sota = " kernel-fitimage"
-KERNEL_IMAGETYPE_sota = "fitImage"
+KERNEL_CLASSES:append:sota = " kernel-fitimage"
+KERNEL_IMAGETYPE:sota = "fitImage"
 INITRAMFS_FSTYPES = "cpio.gz"
 OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${KERNEL_FIT_LINK_NAME}"
 
@@ -10,15 +10,15 @@ UBOOT_DTB_LOADADDRESS = "0x05000000"
 UBOOT_DTBO_LOADADDRESS = "0x06000000"
 
 # Deploy config fragment list to OSTree root fs
-IMAGE_INSTALL_append = " fit-conf"
+IMAGE_INSTALL:append = " fit-conf"
 
-DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx"
-IMAGE_INSTALL_append_sota = " network-configuration "
+DEV_MATCH_DIRECTIVE:pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx"
+IMAGE_INSTALL:append:sota = " network-configuration "
 
 PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"
-UBOOT_ENTRYPOINT_sota ?= "0x00080000"
+UBOOT_ENTRYPOINT:sota ?= "0x00080000"
 
-IMAGE_FSTYPES_remove_sota = "rpi-sdimg"
+IMAGE_FSTYPES:remove:sota = "rpi-sdimg"
 OSTREE_BOOTLOADER ?= "u-boot"
 
 def make_dtb_boot_files(d):
@@ -39,7 +39,7 @@ def make_dtb_boot_files(d):
 
     return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
 
-IMAGE_BOOT_FILES_sota = "${BOOTFILES_DIR_NAME}/* \
+IMAGE_BOOT_FILES:sota = "${BOOTFILES_DIR_NAME}/* \
                          u-boot.bin;${SDIMG_KERNELIMAGE} \
                          "
 
@@ -47,27 +47,27 @@ IMAGE_BOOT_FILES_sota = "${BOOTFILES_DIR_NAME}/* \
 # bcm2835-bootfiles, now just bootfiles).
 # rpi4 and recent rpi3 firmwares needs dtb in /boot partition
 # so that they can be read by the firmware
-IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}"
+IMAGE_BOOT_FILES:append:sota = "${@make_dtb_boot_files(d)}"
 
 # Just the overlays that will be used should be listed
-KERNEL_DEVICETREE_raspberrypi2_sota ?= " bcm2709-rpi-2-b.dtb "
-KERNEL_DEVICETREE_raspberrypi3_sota ?= " bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/rpi-ft5406.dtbo"
-KERNEL_DEVICETREE_raspberrypi3-64_sota ?= " broadcom/bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/vc4-fkms-v3d.dtbo overlays/rpi-ft5406.dtbo"
-KERNEL_DEVICETREE_raspberrypi4_sota ?= " bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo"
-KERNEL_DEVICETREE_raspberrypi4-64_sota ?= " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo"
-
-SOTA_MAIN_DTB_raspberrypi2 ?= "bcm2709-rpi-2-b.dtb"
-SOTA_MAIN_DTB_raspberrypi3 ?= "bcm2710-rpi-3-b.dtb"
-SOTA_MAIN_DTB_raspberrypi3-64 ?= "broadcom_bcm2710-rpi-3-b.dtb"
-SOTA_MAIN_DTB_raspberrypi4_sota ?= "bcm2711-rpi-4-b.dtb"
-SOTA_MAIN_DTB_raspberrypi4-64_sota ?= "broadcom_bcm2711-rpi-4-b.dtb"
-
-SOTA_DT_OVERLAYS_raspberrypi3 ?= "vc4-kms-v3d.dtbo rpi-ft5406.dtbo"
-SOTA_DT_OVERLAYS_raspberrypi3-64 ?= "vc4-kms-v3d.dtbo vc4-fkms-v3d.dtbo rpi-ft5406.dtbo"
-SOTA_DT_OVERLAYS_raspberrypi4 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo"
-SOTA_DT_OVERLAYS_raspberrypi4-64 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo"
+KERNEL_DEVICETREE:raspberrypi2:sota ?= " bcm2709-rpi-2-b.dtb "
+KERNEL_DEVICETREE:raspberrypi3:sota ?= " bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/rpi-ft5406.dtbo"
+KERNEL_DEVICETREE:raspberrypi3-64:sota ?= " broadcom/bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/vc4-fkms-v3d.dtbo overlays/rpi-ft5406.dtbo"
+KERNEL_DEVICETREE:raspberrypi4:sota ?= " bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo"
+KERNEL_DEVICETREE:raspberrypi4-64:sota ?= " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo"
+
+SOTA_MAIN_DTB:raspberrypi2 ?= "bcm2709-rpi-2-b.dtb"
+SOTA_MAIN_DTB:raspberrypi3 ?= "bcm2710-rpi-3-b.dtb"
+SOTA_MAIN_DTB:raspberrypi3-64 ?= "broadcom_bcm2710-rpi-3-b.dtb"
+SOTA_MAIN_DTB:raspberrypi4:sota ?= "bcm2711-rpi-4-b.dtb"
+SOTA_MAIN_DTB:raspberrypi4-64:sota ?= "broadcom_bcm2711-rpi-4-b.dtb"
+
+SOTA_DT_OVERLAYS:raspberrypi3 ?= "vc4-kms-v3d.dtbo rpi-ft5406.dtbo"
+SOTA_DT_OVERLAYS:raspberrypi3-64 ?= "vc4-kms-v3d.dtbo vc4-fkms-v3d.dtbo rpi-ft5406.dtbo"
+SOTA_DT_OVERLAYS:raspberrypi4 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo"
+SOTA_DT_OVERLAYS:raspberrypi4-64 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo"
 
 # Kernel args normally provided by RPi's internal bootloader. Non-updateable
-OSTREE_KERNEL_ARGS_sota ?= " 8250.nr_uarts=1 bcm2708_fb.fbwidth=656 bcm2708_fb.fbheight=614 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.lpm_enable=0 console=ttyS0,115200 usbhid.mousepoll=0 "
+OSTREE_KERNEL_ARGS:sota ?= " 8250.nr_uarts=1 bcm2708_fb.fbwidth=656 bcm2708_fb.fbheight=614 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.lpm_enable=0 console=ttyS0,115200 usbhid.mousepoll=0 "
 
-SOTA_CLIENT_FEATURES_append = " ubootenv"
+SOTA_CLIENT_FEATURES:append = " ubootenv"
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 4b7990f..33dd597 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -7,6 +7,6 @@ DISTRO_NAME = "OTA-enabled Linux"
 DISTRO_VERSION = "1.0"
 DISTRO_CODENAME = "sota"
 
-DISTRO_FEATURES_append = " systemd"
+DISTRO_FEATURES:append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index bfac90f..13444fd 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -6,4 +6,4 @@ DISTRO_NAME = "OTA-enabled Linux"
 DISTRO_VERSION = "1.0"
 DISTRO_CODENAME = "sota"
 
-IMAGE_INSTALL_append_sota = " ostree-booted"
+IMAGE_INSTALL:append:sota = " ostree-booted"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 99035de..f84b834 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -4,14 +4,14 @@
 #
 # require conf/distro/sota.conf.inc
 
-DISTRO_FEATURES_append = " sota usrmerge"
-DISTRO_FEATURES_NATIVE_append = " sota"
+DISTRO_FEATURES:append = " sota usrmerge"
+DISTRO_FEATURES_NATIVE:append = " sota"
 INHERIT += " sota"
 # Prelinking increases the size of downloads and causes build errors
-USER_CLASSES_remove = "image-prelink"
+USER_CLASSES:remove = "image-prelink"
 
 # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using.
-INHERIT_remove = "reproducible_build"
+INHERIT:remove = "reproducible_build"
 INHERIT += "reproducible_build_simple"
 
 export SOURCE_DATE_EPOCH = "0"
diff --git a/conf/layer.conf b/conf/layer.conf
index bce1439..16c1b50 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,7 +12,7 @@ BBFILE_PRIORITY_sota = "7"
 LAYERDEPENDS_sota = "openembedded-layer"
 LAYERDEPENDS_sota += "meta-python"
 LAYERDEPENDS_sota += "filesystems-layer"
-LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott honister"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   aktualizr-device-prov->aktualizr \
diff --git a/conf/local.conf.nonostree.append b/conf/local.conf.nonostree.append
index ee56b69..5d0d065 100644
--- a/conf/local.conf.nonostree.append
+++ b/conf/local.conf.nonostree.append
@@ -1,11 +1,11 @@
 
-DISTRO_FEATURES_append = " systemd"
+DISTRO_FEATURES:append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
 PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"
 
 SOTA_DEPLOY_CREDENTIALS ?= "1"
-PACKAGECONFIG_pn-aktualizr = ""
+PACKAGECONFIG:pn-aktualizr = ""
 
-IMAGE_INSTALL_append += "aktualizr"
-IMAGE_INSTALL_append += "aktualizr-shared-prov"
+IMAGE_INSTALL:append += "aktualizr"
+IMAGE_INSTALL:append += "aktualizr-shared-prov"
diff --git a/conf/local.conf.systemd.append b/conf/local.conf.systemd.append
index 12e0182..be2e281 100644
--- a/conf/local.conf.systemd.append
+++ b/conf/local.conf.systemd.append
@@ -3,7 +3,7 @@
 # It greatly helps diagnosing issues on testing devices but should be
 # carefully weighted against file system usage and flash device wear for
 # production systems. Please refer to systemd's docs for more details
-IMAGE_INSTALL_append += " systemd-journald-persistent"
+IMAGE_INSTALL:append += " systemd-journald-persistent"
 
 # Set resource limits for aktualizr service
 #
@@ -12,4 +12,4 @@ IMAGE_INSTALL_append += " systemd-journald-persistent"
 #RESOURCE_CPU_WEIGHT_pn-aktualizr = "100"
 #RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M"
 #RESOURCE_MEMORY_MAX_pn-aktualizr = "80%"
-IMAGE_INSTALL_append += " aktualizr-resource-control"
+IMAGE_INSTALL:append += " aktualizr-resource-control"
diff --git a/lib/oeqa/selftest/cases/updater_native.py b/lib/oeqa/selftest/cases/updater_native.py
index d2bf341..a60d22f 100644
--- a/lib/oeqa/selftest/cases/updater_native.py
+++ b/lib/oeqa/selftest/cases/updater_native.py
@@ -28,7 +28,7 @@ class SotaToolsTests(OESelftestTestCase):
 
 class GeneralTests(OESelftestTestCase):
 
-    def test_feature_sota(self):
+    def test_feature:sota(self):
         result = get_bb_var('DISTRO_FEATURES').find('sota')
         self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES')
 
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index c7d0448..b074269 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -84,7 +84,7 @@ class SharedCredProvTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
@@ -124,16 +124,16 @@ class SharedCredProvTestsNonOSTree(SharedCredProvTests):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = ""')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"')
 
         self.append_config('DISTRO = "poky"')
-        self.append_config('DISTRO_FEATURES_append = " systemd"')
+        self.append_config('DISTRO_FEATURES:append = " systemd"')
         self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"')
         self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"')
-        self.append_config('PACKAGECONFIG_pn-aktualizr = ""')
+        self.append_config('PACKAGECONFIG:pn-aktualizr = ""')
         self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"')
-        self.append_config('IMAGE_INSTALL_append += "aktualizr aktualizr-info aktualizr-shared-prov"')
+        self.append_config('IMAGE_INSTALL:append += "aktualizr aktualizr-info aktualizr-shared-prov"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no')
 
 
@@ -149,8 +149,8 @@ class ManualControlTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -190,7 +190,7 @@ class DeviceCredProvTests(OESelftestTestCase):
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "')
         self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
         bitbake('build-sysroots -c build_native_sysroot')
 
@@ -243,8 +243,8 @@ class DeviceCredProvHsmTests(OESelftestTestCase):
         self.append_config('SOTA_CLIENT_PROV = "aktualizr-device-prov-hsm"')
         self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"')
         self.append_config('SOTA_CLIENT_FEATURES = "hsm"')
-        self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_INSTALL:append = " softhsm-testtoken"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
         bitbake('build-sysroots -c build_native_sysroot')
 
@@ -407,7 +407,7 @@ class IpSecondaryTests(OESelftestTestCase):
         else:
             self.meta_qemu = None
 
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.primary = IpSecondaryTests.Primary(self)
         self.secondary = IpSecondaryTests.Secondary(self)
 
@@ -451,11 +451,11 @@ class ResourceControlTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
-        self.append_config('IMAGE_INSTALL_append += " aktualizr-resource-control "')
-        self.append_config('RESOURCE_CPU_WEIGHT_pn-aktualizr = "1000"')
-        self.append_config('RESOURCE_MEMORY_HIGH_pn-aktualizr = "50M"')
-        self.append_config('RESOURCE_MEMORY_MAX_pn-aktualizr = "1M"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_INSTALL:append += " aktualizr-resource-control "')
+        self.append_config('RESOURCE_CPU_WEIGHT:pn-aktualizr = "1000"')
+        self.append_config('RESOURCE_MEMORY_HIGH:pn-aktualizr = "50M"')
+        self.append_config('RESOURCE_MEMORY_MAX:pn-aktualizr = "1M"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -502,9 +502,9 @@ class NonSystemdTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.append_config('DISTRO = "poky-sota"')
-        self.append_config('IMAGE_INSTALL_remove += " aktualizr-resource-control"')
+        self.append_config('IMAGE_INSTALL:remove += " aktualizr-resource-control"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
index d20a9f0..8c7eb53 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
@@ -17,10 +17,10 @@ class PtestTests(OESelftestTestCase):
         else:
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
-        self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
-        self.append_config('PTEST_ENABLED_pn-aktualizr = "1"')
-        self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"')
+        self.append_config('PTEST_ENABLED:pn-aktualizr = "1"')
+        self.append_config('IMAGE_INSTALL:append += "aktualizr-ptest ptest-runner "')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M")
 
     def tearDownLocal(self):
diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py
index fae631e..5534ee9 100644
--- a/lib/oeqa/selftest/cases/updater_raspberrypi.py
+++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py
@@ -15,16 +15,16 @@ class RpiTests(OESelftestTestCase):
     def setUpLocal(self):
         # Add layers before changing the machine type, otherwise the sanity
         # checker complains loudly.
-        layer_rpi = "meta-raspberrypi"
-        layer_upd_rpi = "meta-updater-raspberrypi"
+        layer:rpi = "meta-raspberrypi"
+        layer_upd:rpi = "meta-updater-raspberrypi"
         result = runCmd('bitbake-layers show-layers')
         if re.search(layer_rpi, result.output) is None:
-            self.meta_rpi = metadir() + layer_rpi
+            self.meta_rpi = metadir() + layer:rpi
             runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi)
         else:
             self.meta_rpi = None
         if re.search(layer_upd_rpi, result.output) is None:
-            self.meta_upd_rpi = metadir() + layer_upd_rpi
+            self.meta_upd_rpi = metadir() + layer_upd:rpi
             runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi)
         else:
             self.meta_upd_rpi = None
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
index cd1b95d..cde4849 100644
--- a/recipes-connectivity/connman/connman_%.bbappend
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -1 +1 @@
-RPROVIDES_${PN} += "network-configuration"
+RPROVIDES:${PN} += "network-configuration"
diff --git a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb
index 8eb81b1..fd84fc2 100644
--- a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb
+++ b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 
 inherit systemd features_check
 
-RPROVIDES_${PN} = "network-configuration"
+RPROVIDES:${PN} = "network-configuration"
 
 SRC_URI = " \
   file://20-wired-dhcp.network \
@@ -16,19 +16,19 @@ SRC_URI = " \
 PR = "r1"
 
 REQUIRED_DISTRO_FEATURES = "systemd"
-RCONFLICTS_${PN} = "connman"
+RCONFLICTS:${PN} = "connman"
 
 S = "${WORKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
         ${systemd_unitdir}/network/* \
         ${sbindir}/resolvconf-clean \
         ${systemd_unitdir}/system/clean-connman-symlink.service \
         "
 
-SYSTEMD_SERVICE_${PN} = "clean-connman-symlink.service"
+SYSTEMD_SERVICE:${PN} = "clean-connman-symlink.service"
 
 DEV_MATCH_DIRECTIVE ?= "Name=en*"
 
diff --git a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
index 7cce775..cb06579 100644
--- a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
+++ b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend_sota := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:sota := "${THISDIR}/${BPN}:"
 
-SRC_URI_append_sota = " file://nfs-home-mount.service"
+SRC_URI:append:sota = " file://nfs-home-mount.service"
 
-SYSTEMD_SERVICE_${PN}_append_sota = " nfs-home-mount.service"
+SYSTEMD_SERVICE:${PN}:append:sota = " nfs-home-mount.service"
 
-CONFFILES_${PN}-client_append_sota = " ${localstatedir}/local/lib"
+CONFFILES:${PN}-client:append:sota = " ${localstatedir}/local/lib"
 
-do_install_append_sota () {
+do_install:append:sota () {
     install -d ${D}${localstatedir}/local
     cp -aPR ${D}${localstatedir}/lib ${D}${localstatedir}/local
 
diff --git a/recipes-connectivity/zabbix/zabbix_%.bbappend b/recipes-connectivity/zabbix/zabbix_%.bbappend
index c6a69b5..c33094f 100644
--- a/recipes-connectivity/zabbix/zabbix_%.bbappend
+++ b/recipes-connectivity/zabbix/zabbix_%.bbappend
@@ -1,5 +1,5 @@
 
-do_install_append() {
+do_install:append() {
 
     # Set the zabbix Server 
     if [ ! -z ${SOTA_COMM_CONF_ZABBIX_SERVER} ]; then
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb
index 4af1548..cba737d 100644
--- a/recipes-core/images/initramfs-ostree-image.bb
+++ b/recipes-core/images/initramfs-ostree-image.bb
@@ -13,7 +13,7 @@ IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"
 
-IMAGE_CLASSES_remove = "image_repo_manifest qemuboot"
+IMAGE_CLASSES:remove = "image_repo_manifest qemuboot"
 
 IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 
diff --git a/recipes-devtools/valgrind/valgrind_%.bbappend b/recipes-devtools/valgrind/valgrind_%.bbappend
index c5f7c31..3c23e3d 100644
--- a/recipes-devtools/valgrind/valgrind_%.bbappend
+++ b/recipes-devtools/valgrind/valgrind_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # from https://bugs.kde.org/show_bug.cgi?id=344802 (John Reiser)
 SRC_URI += "file://bug344802-unhandled-0xec510f1e.patch"
diff --git a/recipes-extended/collectd/collectd_%.bbappend b/recipes-extended/collectd/collectd_%.bbappend
index fb3e6c4..8e2ee24 100644
--- a/recipes-extended/collectd/collectd_%.bbappend
+++ b/recipes-extended/collectd/collectd_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
     printf "<Include \"${sysconfdir}/collectd.conf.d\">\nFilter \"*.conf\"\n</Include>\n" >> ${D}/${sysconfdir}/collectd.conf
 
     install -d ${D}/${sysconfdir}/collectd.conf.d
diff --git a/recipes-extended/ostree/ostree_%.bbappend b/recipes-extended/ostree/ostree_%.bbappend
index fd1795f..6714d12 100644
--- a/recipes-extended/ostree/ostree_%.bbappend
+++ b/recipes-extended/ostree/ostree_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG_append = " curl libarchive static builtin-grub2-mkconfig"
-PACKAGECONFIG_class-native_append = " curl"
-PACKAGECONFIG_remove = "soup"
-PACKAGECONFIG_class-native_remove = "soup"
+PACKAGECONFIG:append = " curl libarchive static builtin-grub2-mkconfig"
+PACKAGECONFIG:class-native:append = " curl"
+PACKAGECONFIG:remove = "soup"
+PACKAGECONFIG:class-native:remove = "soup"
diff --git a/recipes-sota/aktualizr/aktualizr-collectd.bb b/recipes-sota/aktualizr/aktualizr-collectd.bb
index c1fc717..5fd81d9 100644
--- a/recipes-sota/aktualizr/aktualizr-collectd.bb
+++ b/recipes-sota/aktualizr/aktualizr-collectd.bb
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
-RDEPENDS_${PN} = "collectd"
+RDEPENDS:${PN} = "collectd"
 
 SRC_URI = " file://aktualizr-collectd.conf"
 
@@ -15,7 +15,7 @@ do_install() {
     install -m 0644 ${WORKDIR}/aktualizr-collectd.conf ${D}${sysconfdir}/collectd.conf.d/aktualizr.conf
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${sysconfdir}/collectd.conf.d \
                 ${sysconfdir}/collectd.conf.d/aktualizr.conf \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb
index 7239bfd..28b4598 100644
--- a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb
+++ b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb
@@ -24,7 +24,7 @@ do_install() {
         ${D}${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov.bb b/recipes-sota/aktualizr/aktualizr-device-prov.bb
index 391b098..99379ab 100644
--- a/recipes-sota/aktualizr/aktualizr-device-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-device-prov.bb
@@ -24,7 +24,7 @@ do_install() {
         ${D}${libdir}/sota/conf.d/20-sota-device-cred.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/20-sota-device-cred.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-hwid.bb b/recipes-sota/aktualizr/aktualizr-hwid.bb
index fd3e395..4ceb776 100644
--- a/recipes-sota/aktualizr/aktualizr-hwid.bb
+++ b/recipes-sota/aktualizr/aktualizr-hwid.bb
@@ -16,7 +16,7 @@ do_install() {
     fi
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/40-hardware-id.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb
index 9c6f0dd..90a0a2b 100644
--- a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb
+++ b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 inherit allarch
 
 DEPENDS = "zip-native"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 # If the config file from aktualizr used here is changed, you will need to bump
 # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS!
@@ -35,7 +35,7 @@ do_install() {
     fi
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${localstatedir}/sota/sota_provisioning_credentials.zip \
                 "
 
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov.bb b/recipes-sota/aktualizr/aktualizr-shared-prov.bb
index 0c54f32..ad4de5a 100644
--- a/recipes-sota/aktualizr/aktualizr-shared-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-shared-prov.bb
@@ -10,7 +10,7 @@ inherit allarch
 # We need to get the config files from the aktualizr-configs package built by
 # the aktualizr (target) recipe.
 DEPENDS = "aktualizr"
-RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}"
+RDEPENDS:${PN}:append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}"
 
 # If the config file from aktualizr used here is changed, you will need to bump
 # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS!
@@ -38,7 +38,7 @@ do_install() {
         ${D}${libdir}/sota/conf.d/20-sota-shared-cred.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/20-sota-shared-cred.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
index 2895e5c..6d0bd43 100644
--- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
+++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
@@ -20,7 +20,7 @@ do_install() {
     install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-uboot-env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/30-rollback.toml \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index ecfbd2b..47e733c 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -6,12 +6,12 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
 
 DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native"
-DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}"
-RDEPENDS_${PN}_class-target = "${PN}-hwid lshw"
+DEPENDS:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}"
+RDEPENDS:${PN}:class-target = "${PN}-hwid lshw"
 
-RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind"
+RDEPENDS:${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind"
 
-PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so"
+PRIVATE_LIBS:${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so"
 
 PV = "1.0+git${SRCPV}"
 PR = "7"
@@ -39,12 +39,12 @@ S = "${WORKDIR}/git"
 inherit cmake pkgconfig ptest systemd
 
 # disable ptest by default as it slows down builds quite a lot
-# can be enabled manually by setting 'PTEST_ENABLED_pn-aktualizr' to '1' in local.conf
+# can be enabled manually by setting 'PTEST_ENABLED:pn-aktualizr' to '1' in local.conf
 PTEST_ENABLED = "0"
 
 SYSTEMD_PACKAGES = "${PN} ${PN}-secondary"
-SYSTEMD_SERVICE_${PN} = "aktualizr.service"
-SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.service"
+SYSTEMD_SERVICE:${PN} = "aktualizr.service"
+SYSTEMD_SERVICE:${PN}-secondary = "aktualizr-secondary.service"
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}"
 
@@ -52,7 +52,7 @@ GARAGE_SIGN_OPS = "${@ d.expand('-DGARAGE_SIGN_ARCHIVE=${WORKDIR}/cli-${GARAGE_S
 PKCS11_ENGINE_PATH = "${libdir}/engines-1.1/pkcs11.so"
 
 PACKAGECONFIG ?= "ostree ${@bb.utils.filter('SOTA_CLIENT_FEATURES', 'hsm serialcan ubootenv', d)}"
-PACKAGECONFIG_class-native = "sota-tools"
+PACKAGECONFIG:class-native = "sota-tools"
 PACKAGECONFIG[warning-as-error] = "-DWARNING_AS_ERROR=ON,-DWARNING_AS_ERROR=OFF,"
 PACKAGECONFIG[ostree] = "-DBUILD_OSTREE=ON,-DBUILD_OSTREE=OFF,ostree,"
 PACKAGECONFIG[hsm] = "-DBUILD_P11=ON -DPKCS11_ENGINE_PATH=${PKCS11_ENGINE_PATH},-DBUILD_P11=OFF,libp11,"
@@ -87,7 +87,7 @@ do_install_ptest() {
     find ${D}/${PTEST_PATH}/build -name "*.cmake" -or -name "DartConfiguration.tcl" -or -name "run-valgrind" | xargs sed -e "s|${S}|${PTEST_PATH}/src|g" -e "s|${B}|${PTEST_PATH}/build|g" -e "s|\"--gtest_output[^\"]*\"||g" -i
 }
 
-do_install_append () {
+do_install:append () {
     install -d ${D}${libdir}/sota
     install -m 0644 ${S}/config/sota-shared-cred.toml ${D}/${libdir}/sota/sota-shared-cred.toml
     install -m 0644 ${S}/config/sota-device-cred-hsm.toml ${D}/${libdir}/sota/sota-device-cred-hsm.toml
@@ -118,7 +118,7 @@ do_install_append () {
            ${D}${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf
 }
 
-PACKAGESPLITFUNCS_prepend = "split_hosttools_packages "
+PACKAGESPLITFUNCS:prepend = "split_hosttools_packages "
 
 python split_hosttools_packages () {
     bindir = d.getVar('bindir')
@@ -131,43 +131,43 @@ PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*"
 
 PACKAGES =+ "${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${bindir}/aktualizr \
                 ${systemd_unitdir}/system/aktualizr.service \
                 "
 
-FILES_${PN}-info = " \
+FILES:${PN}-info = " \
                 ${bindir}/aktualizr-info \
                 "
 
-FILES_${PN}-lib = " \
+FILES:${PN}-lib = " \
                 ${libdir}/libaktualizr.so \
                 "
 
-FILES_${PN}-resource-control = " \
+FILES:${PN}-resource-control = " \
                 ${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf \
                 "
 
-FILES_${PN}-configs = " \
+FILES:${PN}-configs = " \
                 ${sysconfdir}/sota/* \
                 ${libdir}/sota/* \
                 "
 
-FILES_${PN}-secondary = " \
+FILES:${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
                 ${libdir}/sota/sota-secondary.toml \
                 ${systemd_unitdir}/system/aktualizr-secondary.service \
                 "
 
-FILES_${PN}-secondary-lib = " \
+FILES:${PN}-secondary-lib = " \
                 ${libdir}/libaktualizr_secondary.so \
                 "
 
-FILES_${PN}-sotatools-lib = " \
+FILES:${PN}-sotatools-lib = " \
                 ${libdir}/libsota_tools.so \
                 "
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
                 ${includedir}/lib${PN} \
                 "
 
diff --git a/recipes-sota/aktualizr/credentials.inc b/recipes-sota/aktualizr/credentials.inc
index 7c44257..0fed92e 100644
--- a/recipes-sota/aktualizr/credentials.inc
+++ b/recipes-sota/aktualizr/credentials.inc
@@ -1 +1 @@
-SRC_URI_append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS')) if d.getVar('SOTA_PACKED_CREDENTIALS') else ''}"
+SRC_URI:append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS')) if d.getVar('SOTA_PACKED_CREDENTIALS') else ''}"
diff --git a/recipes-sota/config/aktualizr-auto-reboot.bb b/recipes-sota/config/aktualizr-auto-reboot.bb
index f360d9e..6048d92 100644
--- a/recipes-sota/config/aktualizr-auto-reboot.bb
+++ b/recipes-sota/config/aktualizr-auto-reboot.bb
@@ -11,12 +11,12 @@ SRC_URI = " \
             file://35-enable-auto-reboot.toml \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/35-enable-auto-reboot.toml ${D}${libdir}/sota/conf.d/35-enable-auto-reboot.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/35-enable-auto-reboot.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-binary-pacman.bb b/recipes-sota/config/aktualizr-binary-pacman.bb
index 36bafb3..ec936ae 100644
--- a/recipes-sota/config/aktualizr-binary-pacman.bb
+++ b/recipes-sota/config/aktualizr-binary-pacman.bb
@@ -8,7 +8,7 @@ SRC_URI = "\
     file://10-pacman.toml \
     "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/10-pacman.toml \
               "
diff --git a/recipes-sota/config/aktualizr-disable-send-ip.bb b/recipes-sota/config/aktualizr-disable-send-ip.bb
index 07c12ca..5df2b34 100644
--- a/recipes-sota/config/aktualizr-disable-send-ip.bb
+++ b/recipes-sota/config/aktualizr-disable-send-ip.bb
@@ -11,12 +11,12 @@ SRC_URI = " \
             file://30-disable-send-ip.toml \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/30-disable-send-ip.toml ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/30-disable-send-ip.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-log-debug.bb b/recipes-sota/config/aktualizr-log-debug.bb
index 0c03786..6e2d1f3 100644
--- a/recipes-sota/config/aktualizr-log-debug.bb
+++ b/recipes-sota/config/aktualizr-log-debug.bb
@@ -11,12 +11,12 @@ SRC_URI = " \
             file://05-log-debug.toml \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/05-log-debug.toml ${D}${libdir}/sota/conf.d/05-log-debug.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/05-log-debug.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-polling-interval.bb b/recipes-sota/config/aktualizr-polling-interval.bb
index 53c008a..6ad295d 100644
--- a/recipes-sota/config/aktualizr-polling-interval.bb
+++ b/recipes-sota/config/aktualizr-polling-interval.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 
 SOTA_POLLING_SEC ?= "30"
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/60-polling-interval.toml ${D}${libdir}/sota/conf.d/60-polling-interval.toml
 
@@ -21,7 +21,7 @@ do_install_append () {
            ${D}${libdir}/sota/conf.d/60-polling-interval.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/60-polling-interval.toml \
                 "
 
diff --git a/recipes-sota/config/aktualizr-virtualsec.bb b/recipes-sota/config/aktualizr-virtualsec.bb
index b7d55aa..f4fded3 100644
--- a/recipes-sota/config/aktualizr-virtualsec.bb
+++ b/recipes-sota/config/aktualizr-virtualsec.bb
@@ -12,13 +12,13 @@ SRC_URI = " \
             file://virtualsec.json \
             "
 
-do_install_append () {
+do_install:append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
     install -m 0644 ${WORKDIR}/30-virtualsec.toml ${D}${libdir}/sota/conf.d/30-virtualsec.toml
     install -m 0644 ${WORKDIR}/virtualsec.json ${D}${libdir}/sota/virtualsec.json
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/30-virtualsec.toml \
                 ${libdir}/sota/virtualsec.json \
                 "
diff --git a/recipes-sota/fit-conf/fit-conf.bb b/recipes-sota/fit-conf/fit-conf.bb
index f409b9b..b3714f4 100644
--- a/recipes-sota/fit-conf/fit-conf.bb
+++ b/recipes-sota/fit-conf/fit-conf.bb
@@ -21,4 +21,4 @@ do_install() {
         done
 }
 
-FILES_${PN} += "${libdir}/fit_conf"
+FILES:${PN} += "${libdir}/fit_conf"
diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bb b/recipes-sota/ostree-initrd/ostree-initrd.bb
index e7bd929..903d9ad 100644
--- a/recipes-sota/ostree-initrd/ostree-initrd.bb
+++ b/recipes-sota/ostree-initrd/ostree-initrd.bb
@@ -17,4 +17,4 @@ do_install() {
 
 inherit allarch
 
-FILES_${PN} += " /dev /etc/initrd-release /init "
+FILES:${PN} += " /dev /etc/initrd-release /init "
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
index d711222..1957b8e 100644
--- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
+++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
@@ -9,12 +9,12 @@ inherit module-base kernel-artifact-names
 
 PACKAGES = "ostree-kernel ostree-initramfs ostree-devicetrees"
 
-ALLOW_EMPTY_ostree-initramfs = "1"
-ALLOW_EMPTY_ostree-devicetrees = "1"
+ALLOW_EMPTY:ostree-initramfs = "1"
+ALLOW_EMPTY:ostree-devicetrees = "1"
 
-FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz"
-FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img"
-FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \
+FILES:ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz"
+FILES:ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img"
+FILES:ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \
     ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \
 "
 
diff --git a/recipes-support/fuse/fuse_%.bbappend b/recipes-support/fuse/fuse_%.bbappend
index 85bdf50..fa8f632 100644
--- a/recipes-support/fuse/fuse_%.bbappend
+++ b/recipes-support/fuse/fuse_%.bbappend
@@ -1,3 +1,3 @@
-BBCLASSEXTEND_append_sota = " native"
+BBCLASSEXTEND:append:sota = " native"
 
-PACKAGES_append_class-native_sota = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native', ' ', d)}"
+PACKAGES:append:class-native:sota = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native', ' ', d)}"
diff --git a/recipes-support/slcand-start/slcand-start.bb b/recipes-support/slcand-start/slcand-start.bb
index 566507b..5f38c39 100644
--- a/recipes-support/slcand-start/slcand-start.bb
+++ b/recipes-support/slcand-start/slcand-start.bb
@@ -4,16 +4,16 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit systemd
 
-RDEPENDS_${PN} = "can-utils"
+RDEPENDS:${PN} = "can-utils"
 
 SRC_URI = "file://slcand@.service"
 
-SYSTEMD_SERVICE_${PN} = "slcand@.service"
+SYSTEMD_SERVICE:${PN} = "slcand@.service"
 
 do_install() {
   install -d ${D}${systemd_unitdir}/system
   install -m 0644 ${WORKDIR}/slcand@.service ${D}${systemd_unitdir}/system/slcand@.service
 }
 
-FILES_${PN} = "${systemd_unitdir}/system/createtoken.service"
+FILES:${PN} = "${systemd_unitdir}/system/createtoken.service"
 
diff --git a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
index 68514b2..48fa2d1 100644
--- a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
+++ b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
@@ -4,14 +4,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit systemd
 
-RDEPENDS_${PN} = "softhsm libp11 opensc openssl-bin"
-DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
+RDEPENDS:${PN} = "softhsm libp11 opensc openssl-bin"
+DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
 
 
 SRC_URI = "file://createtoken.service \
            file://createtoken.sh"
 
-SYSTEMD_SERVICE_${PN} = "createtoken.service"
+SYSTEMD_SERVICE:${PN} = "createtoken.service"
 
 do_install() {
   install -d ${D}${systemd_unitdir}/system
@@ -20,6 +20,6 @@ do_install() {
   install -m 0744 ${WORKDIR}/createtoken.sh ${D}${bindir}/createtoken.sh
 }
 
-FILES_${PN} = "${bindir}/createtoken.sh \
+FILES:${PN} = "${bindir}/createtoken.sh \
                ${systemd_unitdir}/system/createtoken.service"
 
diff --git a/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb b/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb
index 1715fe1..7f2a3ae 100644
--- a/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb
+++ b/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI_append = " file://10-persistent-journal.conf"
+SRC_URI:append = " file://10-persistent-journal.conf"
 PR = "r1"
 
 S = "${WORKDIR}"
 
-FILES_${PN} = "${systemd_unitdir}/journald.conf.d/*"
+FILES:${PN} = "${systemd_unitdir}/journald.conf.d/*"
 
 do_install() {
     install -d ${D}/${systemd_unitdir}/journald.conf.d
diff --git a/recipes-test/big-update/big-update_1.0.bb b/recipes-test/big-update/big-update_1.0.bb
index dfb3a96..3bfff1f 100644
--- a/recipes-test/big-update/big-update_1.0.bb
+++ b/recipes-test/big-update/big-update_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MPL-2.0"
 
 SRC_URI = "file://rand_file.py"
 
-FILES_${PN} = "/usr/lib/big-update"
+FILES:${PN} = "/usr/lib/big-update"
 
 DEPENDS = "coreutils-native"
 
diff --git a/recipes-test/big-update/big-update_2.0.bb b/recipes-test/big-update/big-update_2.0.bb
index 690e62c..d681034 100644
--- a/recipes-test/big-update/big-update_2.0.bb
+++ b/recipes-test/big-update/big-update_2.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 
 SRC_URI = "file://rand_file.py"
 
-FILES_${PN} = "${libdir}/big-update"
+FILES:${PN} = "${libdir}/big-update"
 
 DEPENDS = "coreutils-native"
 
diff --git a/recipes-test/demo-config/primary-config.bb b/recipes-test/demo-config/primary-config.bb
index 5c8abb5..603437a 100644
--- a/recipes-test/demo-config/primary-config.bb
+++ b/recipes-test/demo-config/primary-config.bb
@@ -63,7 +63,7 @@ do_install () {
     sed -i "s|@CFG_FILEPATH@|$SECONDARY_CONFIG_FILEPATH_ON_IMAGE|g" ${D}${libdir}/sota/conf.d/30-secondary-config.toml
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d/* \
                 ${sysconfdir}/sota/ecus/* \
                 "
diff --git a/recipes-test/demo-config/secondary-config.bb b/recipes-test/demo-config/secondary-config.bb
index 638f0ae..a0e5d50 100644
--- a/recipes-test/demo-config/secondary-config.bb
+++ b/recipes-test/demo-config/secondary-config.bb
@@ -50,7 +50,7 @@ do_install () {
 
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
                 ${libdir}/sota/conf.d \
                 ${libdir}/sota/conf.d/30-pacman-config.toml \
                 ${libdir}/sota/conf.d/35-network-config.toml \
diff --git a/recipes-test/demo-network-config/network-config.inc b/recipes-test/demo-network-config/network-config.inc
index b023f51..919d4ab 100644
--- a/recipes-test/demo-network-config/network-config.inc
+++ b/recipes-test/demo-network-config/network-config.inc
@@ -1,4 +1,4 @@
-SRC_URI_append = "\
+SRC_URI:append = "\
     file://26-${CONF_TYPE}-client.network \
     "
 
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SECONDARY_INTERFACE ?= "${@ 'eth0' if d.getVar('MACHINE') == 'raspberrypi3' else 'enp0s5'}"
 
-do_install_append() {
+do_install:append() {
     bbnote "Network configuration type to be applied: ${CONF_TYPE}"
     install -d ${D}${libdir}/systemd/network
     install -m 0644 ${WORKDIR}/26-${CONF_TYPE}-client.network ${D}${libdir}/systemd/network/
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb
index 7ee873f..253bd48 100644
--- a/recipes-test/demo-network-config/primary-network-config.bb
+++ b/recipes-test/demo-network-config/primary-network-config.bb
@@ -6,7 +6,7 @@ SRC_URI = "\
     file://27-dhcp-client-external.network \
     "
 
-FILES_${PN} = "${libdir}/systemd/network"
+FILES:${PN} = "${libdir}/systemd/network"
 
 PR = "1"
 
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb
index b268cd3..a688fdf 100644
--- a/recipes-test/demo-network-config/secondary-network-config.bb
+++ b/recipes-test/demo-network-config/secondary-network-config.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
     file://27-dhcp-client-external.network \
     "
 
-FILES_${PN} = "${libdir}/systemd/network"
+FILES:${PN} = "${libdir}/systemd/network"
 
 PR = "1"
 
diff --git a/recipes-test/images/primary-image.bb b/recipes-test/images/primary-image.bb
index e6896ea..45cf68c 100644
--- a/recipes-test/images/primary-image.bb
+++ b/recipes-test/images/primary-image.bb
@@ -4,11 +4,11 @@ SUMMARY = "A minimal Uptane Primary image running aktualizr, for testing with a
 
 LICENSE = "MPL-2.0"
 
-IMAGE_INSTALL_remove = " \
+IMAGE_INSTALL:remove = " \
                         network-configuration \
                         "
 
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
                          primary-network-config \
                          primary-config \
                        "
diff --git a/recipes-test/images/secondary-image.bb b/recipes-test/images/secondary-image.bb
index 22fb7f3..95e09cf 100644
--- a/recipes-test/images/secondary-image.bb
+++ b/recipes-test/images/secondary-image.bb
@@ -9,7 +9,7 @@ SOTA_HARDWARE_ID ?= "${MACHINE}-sndry"
 
 # Remove default aktualizr primary, and the provisioning configuration (which
 # RDEPENDS on aktualizr)
-IMAGE_INSTALL_remove = " \
+IMAGE_INSTALL:remove = " \
                         aktualizr \
                         aktualizr-shared-prov \
                         aktualizr-shared-prov-creds \
@@ -19,7 +19,7 @@ IMAGE_INSTALL_remove = " \
                         network-configuration \
                         "
 
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
                         aktualizr-secondary \
                         secondary-network-config \
                         secondary-config \
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh
index ae78f06..2dbfa20 100755
--- a/scripts/ci/configure.sh
+++ b/scripts/ci/configure.sh
@@ -52,18 +52,18 @@ if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then
     if [ -n "$TEST_AKTUALIZR_TAG" ]; then
         # tag case
         cat << EOF >> "$SITE_CONF"
-SRCREV_pn-aktualizr = ""
-SRCREV_pn-aktualizr-native = ""
-BRANCH_pn-aktualizr = ";nobranch=1;tag=$TEST_AKTUALIZR_TAG"
-BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
+SRCREV:pn-aktualizr = ""
+SRCREV:pn-aktualizr-native = ""
+BRANCH:pn-aktualizr = ";nobranch=1;tag=$TEST_AKTUALIZR_TAG"
+BRANCH:pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
 EOF
     else
         # branch case
         cat << EOF >> "$SITE_CONF"
-SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV"
-SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}"
-BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH"
-BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
+SRCREV:pn-aktualizr = "$TEST_AKTUALIZR_REV"
+SRCREV:pn-aktualizr-native = "\${SRCREV_pn-aktualizr}"
+BRANCH:pn-aktualizr = "$TEST_AKTUALIZR_BRANCH"
+BRANCH:pn-aktualizr-native = "\${BRANCH_pn-aktualizr}"
 EOF
     fi
 fi