layer: convert to new override syntax

This is the result of automated script (0.9.3) conversion:

+# meta-toradex-distro
+vars = vars + ["preempt-rt","tdx","upstream"]
+# meta-toradex-* machines
+vars = vars + ["apalis-","colibri-","verdin-","tegra124"]
+# meta-freescale
+vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"]

../openembedded-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

23 files changed, 82 insertions, 82 deletions

diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass
index ca73768..b6d7017 100644
--- a/classes/image_type_tezi.bbclass
+++ b/classes/image_type_tezi.bbclass
@@ -5,12 +5,12 @@
 # Since it also generates the image.json description file it is rather
 # interwind with the boot flow which is U-Boot target specific.
 
-WKS_FILE_DEPENDS_append = " tezi-metadata virtual/dtb"
+WKS_FILE_DEPENDS:append = " tezi-metadata virtual/dtb"
 DEPENDS += "${WKS_FILE_DEPENDS}"
 IMAGE_BOOT_FILES_REMOVE = "${@make_dtb_boot_files(d) if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}"
-IMAGE_BOOT_FILES_REMOVE_apalis-tk1 = "${@ d.getVar('KERNEL_DEVICETREE') if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}"
-IMAGE_BOOT_FILES_append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}"
-IMAGE_BOOT_FILES_remove = "${IMAGE_BOOT_FILES_REMOVE}"
+IMAGE_BOOT_FILES_REMOVE:apalis-tk1 = "${@ d.getVar('KERNEL_DEVICETREE') if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}"
+IMAGE_BOOT_FILES:append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}"
+IMAGE_BOOT_FILES:remove = "${IMAGE_BOOT_FILES_REMOVE}"
 
 RM_WORK_EXCLUDE += "${PN}"
 
@@ -20,9 +20,9 @@ TDX_MATRIX_BUILD_TIME ??= "${DATETIME}"
 TDX_MATRIX_BUILD_TIME[vardepsexclude] = "DATETIME"
 
 EMMCDEV = "mmcblk0"
-EMMCDEV_verdin-imx8mp = "emmc"
+EMMCDEV:verdin-imx8mp = "emmc"
 EMMCDEVBOOT0 = "mmcblk0boot0"
-EMMCDEVBOOT0_verdin-imx8mp = "emmc-boot0"
+EMMCDEVBOOT0:verdin-imx8mp = "emmc-boot0"
 TEZI_VERSION ?= "${DISTRO_VERSION}"
 TEZI_DATE ?= "${TDX_MATRIX_BUILD_TIME}"
 TEZI_IMAGE_NAME ?= "${IMAGE_NAME}"
@@ -35,7 +35,7 @@ TEZI_AUTO_INSTALL ??= "false"
 TEZI_BOOT_SUFFIX ??= "${@'bootfs.tar.xz' if oe.types.boolean('${TEZI_USE_BOOTFILES}') else ''}"
 TEZI_CONFIG_FORMAT ??= "2"
 # Require newer Tezi for mx8 Socs with the u-boot environment bugfix
-TEZI_CONFIG_FORMAT_mx8 ??= "4"
+TEZI_CONFIG_FORMAT:mx8 ??= "4"
 TORADEX_FLASH_TYPE ??= "emmc"
 UBOOT_BINARY_TEZI_EMMC ?= "${UBOOT_BINARY}"
 UBOOT_BINARY_TEZI_RAWNAND ?= "${UBOOT_BINARY}"
@@ -45,7 +45,7 @@ UBOOT_ENV_TEZI_RAWNAND ?= "${UBOOT_ENV_TEZI}"
 
 # use DISTRO_FLAVOUR to append to the image name displayed in TEZI
 DISTRO_FLAVOUR ??= ""
-SUMMARY_append = "${DISTRO_FLAVOUR}"
+SUMMARY:append = "${DISTRO_FLAVOUR}"
 
 TEZI_EULA_URL ?= "https://www.nxp.com/docs/en/disclaimer/LA_OPT_NXP_SW.html"
 export TEZI_EULA_URL
@@ -53,10 +53,10 @@ export TEZI_EULA_URL
 # Append tar command to store uncompressed image size to ${T}.
 # If a custom rootfs type is used make sure this file is created
 # before compression.
-IMAGE_CMD_tar_append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar | cut -f 1 > ${T}/image-size${IMAGE_NAME_SUFFIX}"
-CONVERSION_CMD_tar_append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar | cut -f 1 > ${T}/image-size.${type}"
-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"
+IMAGE_CMD:tar:append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar | cut -f 1 > ${T}/image-size${IMAGE_NAME_SUFFIX}"
+CONVERSION_CMD:tar:append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar | cut -f 1 > ${T}/image-size.${type}"
+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"
 
 def get_uncompressed_size(d, type):
     path = os.path.join(d.getVar('T'), "image-size.%s" % type)
@@ -363,15 +363,15 @@ tezi_deploy_bootfs_files[cleandirs] += "${WORKDIR}/bootfs"
 tezi_deploy_bootfs_files[vardeps] += "IMAGE_BOOT_FILES"
 
 TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs"
-IMAGE_CMD_bootfs () {
+IMAGE_CMD:bootfs () {
        :
 }
 TEZI_IMAGE_BOOTFS_PREFUNCS ??= "tezi_deploy_bootfs_files"
 do_image_bootfs[prefuncs] += "${TEZI_IMAGE_BOOTFS_PREFUNCS}"
 
 TEZI_IMAGE_TEZIIMG_PREFUNCS ??= "rootfs_tezi_run_json"
-IMAGE_TYPEDEP_teziimg += "${TEZI_BOOT_SUFFIX} ${TEZI_ROOT_SUFFIX}"
-IMAGE_CMD_teziimg () {
+IMAGE_TYPEDEP:teziimg += "${TEZI_BOOT_SUFFIX} ${TEZI_ROOT_SUFFIX}"
+IMAGE_CMD:teziimg () {
 	bbnote "Create Toradex Easy Installer tarball"
 
 	# Copy image json file to ${WORKDIR}/image-json
diff --git a/classes/toradex-devicetree.bbclass b/classes/toradex-devicetree.bbclass
index 4deb850..4cb30e9 100644
--- a/classes/toradex-devicetree.bbclass
+++ b/classes/toradex-devicetree.bbclass
@@ -41,9 +41,9 @@ DT_FILES_PATH = "${WORKDIR}/machine-overlays"
 
 # The machine specific recipes start with MACHINE_PREFIX}[_-]
 MACHINE_PREFIX = "${MACHINE}"
-MACHINE_PREFIX_colibri-imx7-emmc = "colibri-imx7"
-MACHINE_PREFIX_apalis-imx8x-v11a = "apalis-imx8x"
-MACHINE_PREFIX_colibri-imx8x-v10b = "colibri-imx8x"
+MACHINE_PREFIX:colibri-imx7-emmc = "colibri-imx7"
+MACHINE_PREFIX:apalis-imx8x-v11a = "apalis-imx8x"
+MACHINE_PREFIX:colibri-imx8x-v10b = "colibri-imx8x"
 
 do_collect_overlays () {
     if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" ] ; then
@@ -67,7 +67,7 @@ do_collect_overlays[cleandirs] = "${DT_FILES_PATH}"
 
 addtask collect_overlays after do_patch before do_configure
 
-do_deploy_append () {
+do_deploy:append () {
     install -d ${DEPLOYDIR}/overlays
     if [ -d ${DEPLOYDIR}/devicetree ]; then
         cp ${DEPLOYDIR}/devicetree/* ${DEPLOYDIR}/overlays
diff --git a/classes/toradex-kernel-config.bbclass b/classes/toradex-kernel-config.bbclass
index 8c3ad71..9c0cd32 100644
--- a/classes/toradex-kernel-config.bbclass
+++ b/classes/toradex-kernel-config.bbclass
@@ -1,5 +1,5 @@
 # Assign a config variable in ${B}/.config.
-# Should be called in do_configure_append only.
+# Should be called in do_configure:append only.
 #
 # $1 - config variable to be set
 # $2 - value [n/y/value]
diff --git a/classes/toradex-kernel-localversion.bbclass b/classes/toradex-kernel-localversion.bbclass
index 319ba96..a60b3a6 100644
--- a/classes/toradex-kernel-localversion.bbclass
+++ b/classes/toradex-kernel-localversion.bbclass
@@ -16,7 +16,7 @@ TDX_VERSION ??= "0"
 SCMVERSION ??= "y"
 LOCALVERSION ?= "-${TDX_VERSION}"
 
-kernel_do_configure_append() {
+kernel_do_configure:append() {
 	kernel_configure_variable LOCALVERSION "\"${LOCALVERSION}\""
 
 	if [ "${SCMVERSION}" = "y" ]; then
diff --git a/classes/toradex-u-boot-localversion.bbclass b/classes/toradex-u-boot-localversion.bbclass
index 3ad86db..844cb0e 100644
--- a/classes/toradex-u-boot-localversion.bbclass
+++ b/classes/toradex-u-boot-localversion.bbclass
@@ -17,7 +17,7 @@ LOCALVERSION ??= "-${TDX_VERSION}"
 
 UBOOT_LOCALVERSION = "${LOCALVERSION}"
 
-do_compile_prepend() {
+do_compile:prepend() {
 	if [ "${SCMVERSION}" = "y" ]; then
 		head=`cd ${S} ; git rev-parse --verify --short=12 HEAD 2> /dev/null`
 		printf "%s+git.%s" "${UBOOT_LOCALVERSION}" $head > ${S}/.scmversion
diff --git a/recipes-bsp/gpio-export/gpio-export_1.0.bb b/recipes-bsp/gpio-export/gpio-export_1.0.bb
index 392382a..050893a 100644
--- a/recipes-bsp/gpio-export/gpio-export_1.0.bb
+++ b/recipes-bsp/gpio-export/gpio-export_1.0.bb
@@ -21,6 +21,6 @@ do_install () {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "gpio-export.service"
+SYSTEMD_SERVICE:${PN} = "gpio-export.service"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/tezi-metadata/tezi-metadata_0.3.bb b/recipes-bsp/tezi-metadata/tezi-metadata_0.3.bb
index 50149f9..673c081 100644
--- a/recipes-bsp/tezi-metadata/tezi-metadata_0.3.bb
+++ b/recipes-bsp/tezi-metadata/tezi-metadata_0.3.bb
@@ -14,7 +14,7 @@ SRC_URI = " \
 # So we put LA_OPT_NXP_SW.html to sstate duplicate whitelist, this
 # ensures it could be deployed to ${DEPLOY_DIR_IMAGE} as a backup even
 # it's aleady existed.
-SSTATE_DUPWHITELIST_prepend = "${DEPLOY_DIR_IMAGE}/LA_OPT_NXP_SW.html "
+SSTATE_DUPWHITELIST:prepend = "${DEPLOY_DIR_IMAGE}/LA_OPT_NXP_SW.html "
 
 inherit deploy nopackages
 
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot.bb b/recipes-bsp/u-boot/u-boot-distro-boot.bb
index 596d6df..7830e8e 100644
--- a/recipes-bsp/u-boot/u-boot-distro-boot.bb
+++ b/recipes-bsp/u-boot/u-boot-distro-boot.bb
@@ -10,7 +10,7 @@ SRC_URI = " \
 "
 
 KERNEL_BOOTCMD ??= "bootz"
-KERNEL_BOOTCMD_aarch64 ?= "booti"
+KERNEL_BOOTCMD:aarch64 ?= "booti"
 
 inherit deploy
 
diff --git a/recipes-core/fs-init/fs-init.bb b/recipes-core/fs-init/fs-init.bb
index 023f347..bb9b1b8 100644
--- a/recipes-core/fs-init/fs-init.bb
+++ b/recipes-core/fs-init/fs-init.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Script to expand the rootfs to the full size of its partion, star
 LICENSE = "PD"
 PR = "r3"
 
-RRECOMMENDS_${PN} = "e2fsprogs-resize2fs"
+RRECOMMENDS:${PN} = "e2fsprogs-resize2fs"
 
 SRC_URI = " \
     file://resizefs.sh \
@@ -22,6 +22,6 @@ do_install () {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "resizefs.service"
+SYSTEMD_SERVICE:${PN} = "resizefs.service"
 
 inherit allarch systemd
diff --git a/recipes-core/set-hostname/set-hostname_1.0.bb b/recipes-core/set-hostname/set-hostname_1.0.bb
index 15fa66b..b39abdb 100644
--- a/recipes-core/set-hostname/set-hostname_1.0.bb
+++ b/recipes-core/set-hostname/set-hostname_1.0.bb
@@ -10,12 +10,12 @@ SRC_URI += " \
     file://set-hostname.service \
 "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${bindir} \
     ${systemd_system_unitdir} \
 "
 
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     set-hostname.service \
 "
 
diff --git a/recipes-core/systemd/systemd-conf_%.bbappend b/recipes-core/systemd/systemd-conf_%.bbappend
index 77ab59d..fccd438 100644
--- a/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/recipes-core/systemd/systemd-conf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-conf:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/systemd-conf:"
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
index ea40849..2a022be 100644
--- a/recipes-core/systemd/systemd_%.bbappend
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -1,4 +1,4 @@
 # This allows for udevd automounting with mounts accessible to all.
-do_configure_prepend () {
+do_configure:prepend () {
     sed -i '/PrivateMounts=yes/d' ${S}/units/systemd-udevd.service.in
 }
\ No newline at end of file
diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
index 7b03d77..7820aa2 100644
--- a/recipes-core/udev/udev-extraconf_%.bbappend
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/:"
 
-SRC_URI_append = " file://hotplug.rules \
+SRC_URI:append = " file://hotplug.rules \
                    file://hotplug.sh \
 "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d
     install -m 0644 ${WORKDIR}/hotplug.rules    ${D}${sysconfdir}/udev/rules.d/hotplug.rules
 
diff --git a/recipes-core/util-linux/util-linux_%.bbappend b/recipes-core/util-linux/util-linux_%.bbappend
index 341efcf..b922d21 100644
--- a/recipes-core/util-linux/util-linux_%.bbappend
+++ b/recipes-core/util-linux/util-linux_%.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_ = " file://fstrim.service file://fstrim.timer"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append_ = " file://fstrim.service file://fstrim.timer"
 
 inherit systemd
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "fstrim.service fstrim.timer"
+SYSTEMD_SERVICE:${PN} = "fstrim.service fstrim.timer"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-do_install_append() {
+do_install:append() {
         install -d ${D}${systemd_unitdir}/system
         install -m 0644 ${WORKDIR}/fstrim.service ${D}${systemd_unitdir}/system/
         install -m 0644 ${WORKDIR}/fstrim.timer ${D}${systemd_unitdir}/system/
diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
index f40a663..17c021d 100644
--- a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
+++ b/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/e2fsprogs:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/e2fsprogs:"
 SRC_URI += "file://e2fsck.conf"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf
 }
 
-FILES_e2fsprogs-e2fsck += "${sysconfdir}/e2fsck.conf"
+FILES:e2fsprogs-e2fsck += "${sysconfdir}/e2fsck.conf"
diff --git a/recipes-devtools/mtd/mtd-utils_%.bbappend b/recipes-devtools/mtd/mtd-utils_%.bbappend
index 054c939..5e0ea81 100644
--- a/recipes-devtools/mtd/mtd-utils_%.bbappend
+++ b/recipes-devtools/mtd/mtd-utils_%.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_ = " file://ubihealthd.service"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append_ = " file://ubihealthd.service"
 
 inherit systemd
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "ubihealthd.service"
+SYSTEMD_SERVICE:${PN} = "ubihealthd.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-do_install_append() {
+do_install:append() {
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/ubihealthd.service ${D}${systemd_unitdir}/system/
 	sed -i -e 's,@SBINDIR@,${sbindir},g' \
diff --git a/recipes-devtools/python/python3-docutils_%.bbappend b/recipes-devtools/python/python3-docutils_%.bbappend
index 22f835c..7fdfbc4 100644
--- a/recipes-devtools/python/python3-docutils_%.bbappend
+++ b/recipes-devtools/python/python3-docutils_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/python3-docutils/:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/python3-docutils/:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
 file://rst2man_using_python3.patch \
 "
  
diff --git a/recipes-kernel/backports/backports_5.4.bb b/recipes-kernel/backports/backports_5.4.bb
index adf0b22..36ba93d 100644
--- a/recipes-kernel/backports/backports_5.4.bb
+++ b/recipes-kernel/backports/backports_5.4.bb
@@ -63,7 +63,7 @@ do_install() {
     done
 }
 
-pkg_postinst_${PN} () {
+pkg_postinst:${PN} () {
     if [ -z "$D" ]; then
         depmod -a ${KERNEL_VERSION}
     else
@@ -73,13 +73,13 @@ pkg_postinst_${PN} () {
     fi
 }
 
-pkg_postrm_${PN} () {
+pkg_postrm:${PN} () {
     if [ -z "$D" ]; then
         depmod -a ${KERNEL_VERSION}
     fi
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${sysconfdir}/depmod.d/${DEPMOD_CONF} \
     ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/backports/ \
 "
diff --git a/recipes-kernel/linux/linux-toradex-mainline.inc b/recipes-kernel/linux/linux-toradex-mainline.inc
index ffee627..a41992c 100644
--- a/recipes-kernel/linux/linux-toradex-mainline.inc
+++ b/recipes-kernel/linux/linux-toradex-mainline.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Toradex mainline Linux kernel"
-SUMMARY_preempt-rt = "Toradex mainline real-Time Linux kernel"
+SUMMARY:preempt-rt = "Toradex mainline real-Time Linux kernel"
 SECTION = "kernel"
 LICENSE = "GPLv2"
 
@@ -16,12 +16,12 @@ S = "${WORKDIR}/git"
 DEPENDS += "coreutils-native lzop-native"
 
 # Additional file deployed by recent mainline kernels
-FILES_${KERNEL_PACKAGE_NAME}-base += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
+FILES:${KERNEL_PACKAGE_NAME}-base += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
 
 KERNEL_CONFIG_NAME ?= "${KERNEL_PACKAGE_NAME}-config-${KERNEL_ARTIFACT_NAME}"
 KERNEL_CONFIG_LINK_NAME ?= "${KERNEL_PACKAGE_NAME}-config"
 
-do_deploy_append() {
+do_deploy:append() {
     cp -a ${B}/.config ${DEPLOYDIR}/${KERNEL_CONFIG_NAME}
     ln -sf ${KERNEL_CONFIG_NAME} ${DEPLOYDIR}/${KERNEL_CONFIG_LINK_NAME}
 }
diff --git a/recipes-kernel/linux/linux-toradex-mainline_5.4.bb b/recipes-kernel/linux/linux-toradex-mainline_5.4.bb
index 77ec304..08149bd 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_5.4.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_5.4.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.4:"
 
 LINUX_VERSION ?= "5.4.129"
 PV = "${LINUX_VERSION}+git${SRCPV}"
@@ -12,7 +12,7 @@ KBRANCH = "toradex_5.4.y"
 
 require recipes-kernel/linux/linux-toradex-mainline.inc
 
-SRC_URI_append_preempt-rt = " \
+SRC_URI:append:preempt-rt = " \
     ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/patch-5.4.129-rt61.patch.xz;name=rt-patch \
     file://preempt-rt.scc \
     file://preempt-rt-less-latency.scc \
@@ -24,6 +24,6 @@ SRC_URI[rt-patch.sha256sum] = "f8ddc34c7765bb78c9f44c4e41dae7d4196c87201212ab4ec
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
 KBUILD_DEFCONFIG ?= "toradex-imx_v6_v7_defconfig"
-KBUILD_DEFCONFIG_apalis-tk1 ?= "tegra_defconfig"
+KBUILD_DEFCONFIG:apalis-tk1 ?= "tegra_defconfig"
 
 export DTC_FLAGS = "-@"
diff --git a/recipes-support/libsoc/libsoc_0.8.2.bbappend b/recipes-support/libsoc/libsoc_0.8.2.bbappend
index 1a77694..f28b7ff 100644
--- a/recipes-support/libsoc/libsoc_0.8.2.bbappend
+++ b/recipes-support/libsoc/libsoc_0.8.2.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/libsoc:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/libsoc:"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -8,23 +8,23 @@ SRC_URI += " \
         file://0001-libsoc-use-sane-board-naming.patch \
 "
 
-BOARD_apalis-imx6 = "apalis-imx6"
-BOARD_apalis-tk1 = "apalis-tk1"
-BOARD_colibri-imx6 = "colibri-imx6"
-BOARD_colibri-imx6ull = "colibri-imx6ull"
-BOARD_colibri-imx6ull-emmc = "colibri-imx6ull"
-BOARD_colibri-imx7 = "colibri-imx7"
-BOARD_colibri-imx7-emmc = "colibri-imx7-emmc"
+BOARD:apalis-imx6 = "apalis-imx6"
+BOARD:apalis-tk1 = "apalis-tk1"
+BOARD:colibri-imx6 = "colibri-imx6"
+BOARD:colibri-imx6ull = "colibri-imx6ull"
+BOARD:colibri-imx6ull-emmc = "colibri-imx6ull"
+BOARD:colibri-imx7 = "colibri-imx7"
+BOARD:colibri-imx7-emmc = "colibri-imx7-emmc"
 
-PACKAGECONFIG_apalis-imx6 = "allboardconfigs enableboardconfig python"
-PACKAGECONFIG_apalis-tk1 = "allboardconfigs enableboardconfig python"
-PACKAGECONFIG_colibri-imx6 = "allboardconfigs enableboardconfig python"
-PACKAGECONFIG_colibri-imx6ull = "allboardconfigs enableboardconfig python"
-PACKAGECONFIG_colibri-imx6ull-emmc = "allboardconfigs enableboardconfig python"
-PACKAGECONFIG_colibri-imx7 = "allboardconfigs enableboardconfig python"
-PACKAGECONFIG_colibri-imx7-emmc = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:apalis-imx6 = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:apalis-tk1 = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:colibri-imx6 = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:colibri-imx6ull = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:colibri-imx6ull-emmc = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:colibri-imx7 = "allboardconfigs enableboardconfig python"
+PACKAGECONFIG:colibri-imx7-emmc = "allboardconfigs enableboardconfig python"
 
-pkg_postinst_ontarget_${PN}_colibri-imx6ull () {
+pkg_postinst_ontarget:${PN}:colibri-imx6ull () {
     IS_WIFI_DTB=`grep -c toradex,colibri_imx6ull-wifi /proc/device-tree/compatible`
     if [ $IS_WIFI_DTB -gt 0 ]; then
         mv -f ${datadir}/libsoc/colibri-imx6ull.conf ${datadir}/libsoc/colibri-imx6ull.conf.bak
diff --git a/recipes-support/libusbgx/libusbgx_git.bb b/recipes-support/libusbgx/libusbgx_git.bb
index 6449f9c..44b461b 100644
--- a/recipes-support/libusbgx/libusbgx_git.bb
+++ b/recipes-support/libusbgx/libusbgx_git.bb
@@ -22,11 +22,11 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 MACHINE_NAME ?= "${MACHINE}"
-do_compile_append () {
+do_compile:append () {
     sed -e "s:@@PRODUCT_NAME@@:${MACHINE_NAME}:" ${WORKDIR}/g1.schema.in > ${WORKDIR}/g1.schema
 }
 
-do_install_append () {
+do_install:append () {
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${systemd_unitdir}/system/
         install -m 0644 ${WORKDIR}/usbg.service ${D}${systemd_unitdir}/system
@@ -37,12 +37,12 @@ do_install_append () {
 }
 
 SYSTEMD_PACKAGES = "${PN}-examples"
-SYSTEMD_SERVICE_${PN}-examples = "usbg.service"
+SYSTEMD_SERVICE:${PN}-examples = "usbg.service"
 
 PACKAGES =+ "${PN}-examples"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILES_${PN}-examples = " \
+FILES:${PN}-examples = " \
     ${bindir}/gadget-* \
     ${bindir}/show-gadgets \
     ${bindir}/show-udcs \
diff --git a/recipes-support/snapd/snapd_2.25.bb b/recipes-support/snapd/snapd_2.25.bb
index e1998e8..32060f0 100644
--- a/recipes-support/snapd/snapd_2.25.bb
+++ b/recipes-support/snapd/snapd_2.25.bb
@@ -21,7 +21,7 @@ DEPENDS = " \
     xfsprogs \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ca-certificates \
     kernel-module-squashfs \
     squashfs-tools \
@@ -43,13 +43,13 @@ inherit systemd go autotools pkgconfig python3native
 # and we need to tell the autotools class to look in there.
 AUTOTOOLS_SCRIPT_PATH = "${S}/cmd"
 
-SYSTEMD_SERVICE_${PN} = "snapd.service"
+SYSTEMD_SERVICE:${PN} = "snapd.service"
 
-do_configure_prepend() {
+do_configure:prepend() {
     (cd ${S} ; ./mkversion.sh ${PV})
 }
 
-do_configure_append() {
+do_configure:append() {
     go_do_configure
 }
 
@@ -87,7 +87,7 @@ do_install() {
     echo "PATH=\$PATH:/snap/bin" > ${D}${sysconfdir}/profile.d/20-snap.sh
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${systemd_unitdir}/system/ \
     /var/lib/snapd \
     /var/snap \
@@ -96,4 +96,4 @@ FILES_${PN} += " \
 
 # ERROR: snapd-2.23.5-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary:
 # '.../snapd/usr/lib/snapd/snap-exec' [ldflags]
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"