Convert to new override syntax

This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <[email protected]>
advancedtelematic · Jul 30, 2021 · 31a770d · 31a770d
1 parent a0d9835
commit 31a770d
Show file tree

Hide file tree

Showing 62 changed files with 217 additions and 217 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ Oe-selftest qemux86_64:
   stage: test
   variables:
     TEST_BUILD_DIR: 'build-oe-qemux86_64'
-    OE_SELFTESTS: 'updater_native updater_qemux86_64'
+    OE_SELFTESTS: 'updater_native updater:qemux86_64'
   except:
     - pushes
 
@@ -105,7 +105,7 @@ Ptest qemux86_64:
   stage: test
   variables:
     TEST_BUILD_DIR: 'build-oe-qemux86_64-ptest'
-    OE_SELFTESTS: 'updater_qemux86_64_ptest'
+    OE_SELFTESTS: 'updater:qemux86_64_ptest'
   except:
     - pushes
   only:

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
@@ -15,14 +15,14 @@ SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == '
 
 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"
+CONVERSIONTYPES:append = " tar"
 
 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}
 
@@ -129,7 +129,7 @@ IMAGE_CMD_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
@@ -154,7 +154,7 @@ IMAGE_CMD_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
@@ -182,7 +182,7 @@ 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
@@ -270,7 +270,7 @@ IMAGE_CMD_garagesign () {
 }
 
 IMAGE_TYPEDEP_garagecheck = "garagesign"
-IMAGE_CMD_garagecheck () {
+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
@@ -5,7 +5,7 @@ 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"
+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 () {
+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
@@ -5,20 +5,20 @@ 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 ''}"
 
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}"
 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,11 +46,11 @@ GARAGE_TARGET_EXPIRE_AFTER ?= ""
 GARAGE_CUSTOMIZE_TARGET ?= ""
 
 SOTA_MACHINE ??="none"
-SOTA_MACHINE_rpi ?= "raspberrypi"
+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:qemux86-64 ?= "qemux86-64"
 SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
 SOTA_MACHINE_freedom-u540 ?= "freedom-u540"
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,35 +39,35 @@ 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} \
                          "
 
 # OSTree puts its own boot.scr in ${BOOTFILES_DIR_NAME} (historically
 # 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
@@ -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
@@ -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
@@ -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
@@ -6,13 +6,13 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "sota"
-BBFILE_PATTERN_sota = "^${LAYERDIR}/"
-BBFILE_PRIORITY_sota = "7"
+BBFILE_PATTERN:sota = "^${LAYERDIR}/"
+BBFILE_PRIORITY:sota = "7"
 
-LAYERDEPENDS_sota = "openembedded-layer"
-LAYERDEPENDS_sota += "meta-python"
-LAYERDEPENDS_sota += "filesystems-layer"
-LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott"
+LAYERDEPENDS:sota = "openembedded-layer"
+LAYERDEPENDS:sota += "meta-python"
+LAYERDEPENDS:sota += "filesystems-layer"
+LAYERSERIES_COMPAT:sota = "dunfell gatesgarth hardknott"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   aktualizr-device-prov->aktualizr \

diff --git 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"