Convert to new override syntax

Manual fixes for overrides not covered by the automated script.

Task-number: QTBUG-95705
Change-Id: I7e9f50bf9d384f82c5042044d4f061866e41c3d5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 100512aeb3bd6f576d7d1f15d037470679579817)

15 files changed, 79 insertions, 79 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index ee135c63..1aa049be 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -27,20 +27,20 @@
 ##
 ############################################################################
 
-DEPLOY_CONF_NAME_imx6qdlsabresd = "NXP i.MX6QP/Q/DL SABRE Smart Device"
-DEPLOY_CONF_NAME_imx7dsabresd = "NXP SABRE SD i.MX7 Dual"
-DEPLOY_CONF_NAME_imx8mm-ddr4-evk = "NXP i.MX 8M Mini DDR4 EVK"
-DEPLOY_CONF_NAME_imx8mm-lpddr4-evk = "NXP i.MX 8M Mini LPDDR4 EVK"
-DEPLOY_CONF_NAME_imx8mn-ddr4-evk = "NXP i.MX 8M Nano DDR4 EVK"
-DEPLOY_CONF_NAME_imx8mn-lpddr4-evk = "NXP i.MX 8M Nano LPDDR4 EVK"
-DEPLOY_CONF_NAME_imx8mq-evk = "NXP i.MX 8MQuad EVK"
-DEPLOY_CONF_NAME_imx8qm-mek = "NXP i.MX 8QuadMax MEK"
-DEPLOY_CONF_NAME_imx8qpx-mek = "NXP i.MX 8QuadXPlus MEK"
+DEPLOY_CONF_NAME:imx6qdlsabresd = "NXP i.MX6QP/Q/DL SABRE Smart Device"
+DEPLOY_CONF_NAME:imx7dsabresd = "NXP SABRE SD i.MX7 Dual"
+DEPLOY_CONF_NAME:imx8mm-ddr4-evk = "NXP i.MX 8M Mini DDR4 EVK"
+DEPLOY_CONF_NAME:imx8mm-lpddr4-evk = "NXP i.MX 8M Mini LPDDR4 EVK"
+DEPLOY_CONF_NAME:imx8mn-ddr4-evk = "NXP i.MX 8M Nano DDR4 EVK"
+DEPLOY_CONF_NAME:imx8mn-lpddr4-evk = "NXP i.MX 8M Nano LPDDR4 EVK"
+DEPLOY_CONF_NAME:imx8mq-evk = "NXP i.MX 8MQuad EVK"
+DEPLOY_CONF_NAME:imx8qm-mek = "NXP i.MX 8QuadMax MEK"
+DEPLOY_CONF_NAME:imx8qpx-mek = "NXP i.MX 8QuadXPlus MEK"
 
 IMAGE_FSTYPES += "wic.xz"
 
 IMX_DEFAULT_BSP = "nxp"
-IMX_DEFAULT_KERNEL_b2qt = "linux-imx"
+IMX_DEFAULT_KERNEL:b2qt = "linux-imx"
 
 DEPLOY_CONF_IMAGE_TYPE = "wic.xz"
 
@@ -54,11 +54,11 @@ QBSP_LICENSE_FILE ?= "${FSL_EULA_FILE}"
 QBSP_LICENSE_NAME ?= "NXP Semiconductors Software License Agreement"
 
 # Use gstreamer 1.16 from meta-freescale
-PREFERRED_VERSION_gstreamer1.0_use-nxp-bsp ?= "1.16.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base_use-nxp-bsp ?= "1.16.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good_use-nxp-bsp ?= "1.16.3.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-nxp-bsp ?= "1.16.3.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly_use-nxp-bsp ?= "1.16.0"
-PREFERRED_VERSION_gstreamer1.0-libav_use-nxp-bsp ?= "1.16.0"
+PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.16.2.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.16.2.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.16.3.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.16.3.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:use-nxp-bsp ?= "1.16.0"
+PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.16.0"
 
-MACHINE_GSTREAMER_1_0_PLUGIN:append_imxgpu = " imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin"
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index 9d415f99..e5e5359b 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -29,8 +29,8 @@
 
 # without the distro_bootpart that's not supported by stock u-boot
 KERNEL_ROOTSPEC = "root=/dev/mmcblk${devnum}p1 rw rootwait"
-KERNEL_ROOTSPEC_jetson-nano-2gb-devkit = "root=/dev/mmcblk0p1 rw rootwait"
-KERNEL_ROOTSPEC_jetson-nano-devkit = "root=/dev/mmcblk0p1 rw rootwait"
+KERNEL_ROOTSPEC:jetson-nano-2gb-devkit = "root=/dev/mmcblk0p1 rw rootwait"
+KERNEL_ROOTSPEC:jetson-nano-devkit = "root=/dev/mmcblk0p1 rw rootwait"
 
 INITRAMFS_MAXSIZE = "165888"
 IMAGE_ROOTFS_ALIGNMENT = "1024"
@@ -39,8 +39,8 @@ UBOOT_SUFFIX = "bin"
 IMAGE_FSTYPES += "wic.xz"
 WKS_FILE = "tegra-bootdisk.wks.in"
 
-DEPLOY_CONF_NAME_jetson-tx1-devkit = "NVIDIA Jetson TX1 Development Kit"
-DEPLOY_CONF_NAME_jetson-tx2-devkit = "NVIDIA Jetson TX2 Development Kit"
+DEPLOY_CONF_NAME:jetson-tx1-devkit = "NVIDIA Jetson TX1 Development Kit"
+DEPLOY_CONF_NAME:jetson-tx2-devkit = "NVIDIA Jetson TX2 Development Kit"
 
 DEPLOY_CONF_IMAGE_TYPE = "wic.xz"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/machine-settings.inc b/meta-boot2qt-distro/conf/distro/include/machine-settings.inc
index a6d7a5ce..681a2733 100644
--- a/meta-boot2qt-distro/conf/distro/include/machine-settings.inc
+++ b/meta-boot2qt-distro/conf/distro/include/machine-settings.inc
@@ -28,22 +28,22 @@
 ############################################################################
 
 MACHINE_FAMILY ??= "empty"
-MACHINE_FAMILY_imx = "fsl"
-MACHINE_FAMILY_intel-x86-common = "intel"
+MACHINE_FAMILY:imx = "fsl"
+MACHINE_FAMILY:intel-x86-common = "intel"
 MACHINE_FAMILY:qemuall = "qemu"
-MACHINE_FAMILY_rpi = "raspberrypi"
-MACHINE_FAMILY_tegra = "jetson"
+MACHINE_FAMILY:rpi = "raspberrypi"
+MACHINE_FAMILY:tegra = "jetson"
 
 # Toradex has no overrides that would distinguish them from other nxp boards
-MACHINE_FAMILY_apalis-imx6 = "toradex"
-MACHINE_FAMILY_apalis-imx8 = "toradex"
-MACHINE_FAMILY_colibri-imx6 = "toradex"
-MACHINE_FAMILY_colibri-imx6ull = "toradex"
-MACHINE_FAMILY_colibri-imx7 = "toradex"
-MACHINE_FAMILY_colibri-imx7-emmc = "toradex"
-MACHINE_FAMILY_colibri-imx8x = "toradex"
-MACHINE_FAMILY_verdin-imx8mm = "toradex"
-MACHINE_FAMILY_verdin-imx8mp = "toradex"
+MACHINE_FAMILY:apalis-imx6 = "toradex"
+MACHINE_FAMILY:apalis-imx8 = "toradex"
+MACHINE_FAMILY:colibri-imx6 = "toradex"
+MACHINE_FAMILY:colibri-imx6ull = "toradex"
+MACHINE_FAMILY:colibri-imx7 = "toradex"
+MACHINE_FAMILY:colibri-imx7-emmc = "toradex"
+MACHINE_FAMILY:colibri-imx8x = "toradex"
+MACHINE_FAMILY:verdin-imx8mm = "toradex"
+MACHINE_FAMILY:verdin-imx8mp = "toradex"
 
 include conf/distro/include/${MACHINE_FAMILY}.inc
 include conf/distro/include/${MACHINE}.inc
diff --git a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc
index c653548b..9f4d8fdf 100644
--- a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc
+++ b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc
@@ -42,6 +42,6 @@ PACKAGECONFIG:remove:pn-qtvirtualkeyboard = "hunspell"
 PACKAGECONFIG:remove:pn-python3-pygobject = "cairo"
 
 # intel nuc specific changes
-IMAGE_FSTYPES_intel-x86-common = "tar.gz"
-MACHINE_EXTRA_INSTALL:remove_intel-x86-common = "grub-efi-config"
-QBSP_IMAGE_CONTENT_intel-x86-common = ""
+IMAGE_FSTYPES:intel-x86-common = "tar.gz"
+MACHINE_EXTRA_INSTALL:remove:intel-x86-common = "grub-efi-config"
+QBSP_IMAGE_CONTENT:intel-x86-common = ""
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index ce03264b..d90b9fa1 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -27,12 +27,12 @@
 ##
 ############################################################################
 
-DEPLOY_CONF_NAME_raspberrypi = "Raspberry Pi"
-DEPLOY_CONF_NAME_raspberrypi0 = "Raspberry Pi Zero"
-DEPLOY_CONF_NAME_raspberrypi2 = "Raspberry Pi 2"
-DEPLOY_CONF_NAME_raspberrypi3 = "Raspberry Pi 3"
-DEPLOY_CONF_NAME_raspberrypi4 = "Raspberry Pi 4"
-DEPLOY_CONF_NAME_raspberrypi4-64 = "Raspberry Pi 4 64-bit"
+DEPLOY_CONF_NAME:raspberrypi = "Raspberry Pi"
+DEPLOY_CONF_NAME:raspberrypi0 = "Raspberry Pi Zero"
+DEPLOY_CONF_NAME:raspberrypi2 = "Raspberry Pi 2"
+DEPLOY_CONF_NAME:raspberrypi3 = "Raspberry Pi 3"
+DEPLOY_CONF_NAME:raspberrypi4 = "Raspberry Pi 4"
+DEPLOY_CONF_NAME:raspberrypi4-64 = "Raspberry Pi 4 64-bit"
 
 IMAGE_FSTYPES += "wic.xz"
 
@@ -65,7 +65,7 @@ dtparam=audio=on \n\
 "
 
 # enable device mode from usb-c
-ENABLE_DWC2_PERIPHERAL_raspberrypi4 = "1"
+ENABLE_DWC2_PERIPHERAL:raspberrypi4 = "1"
 
 # additional memory for GPU
 GPU_MEM_256 = "128"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 01a60830..30ea9dc8 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -32,7 +32,7 @@ include conf/distro/include/fsl.inc
 # include file from meta-toradex-nxp
 include conf/machine/include/${MACHINE}.inc
 
-PREFERRED_PROVIDER_virtual/dtb_use-nxp-bsp = "device-tree-overlays"
+PREFERRED_PROVIDER_virtual/dtb:use-nxp-bsp = "device-tree-overlays"
 
 QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.tezi.tar \
@@ -45,29 +45,29 @@ BBMASK += "\
 # Use Toradex defined names
 DEPLOY_CONF_NAME = "Toradex ${MACHINE_NAME}"
 
-ATF_PLATFORM_mx8qm = "imx8qm"
-ATF_PLATFORM_mx8x = "imx8qx"
-ATF_PLATFORM_mx8mm = "imx8mm"
-ATF_PLATFORM_mx8mp = "imx8mp"
-IMX_BOOT_SOC_TARGET_mx8qm = "iMX8QM"
-IMX_BOOT_SOC_TARGET_mx8x = "iMX8QX"
-IMX_BOOT_SOC_TARGET_mx8mm = "iMX8MM"
-IMX_BOOT_SOC_TARGET_mx8mp = "iMX8MP"
+ATF_PLATFORM:mx8qm = "imx8qm"
+ATF_PLATFORM:mx8x = "imx8qx"
+ATF_PLATFORM:mx8mm = "imx8mm"
+ATF_PLATFORM:mx8mp = "imx8mp"
+IMX_BOOT_SOC_TARGET:mx8qm = "iMX8QM"
+IMX_BOOT_SOC_TARGET:mx8x = "iMX8QX"
+IMX_BOOT_SOC_TARGET:mx8mm = "iMX8MM"
+IMX_BOOT_SOC_TARGET:mx8mp = "iMX8MP"
 
 GPULESS_FEATURES = "wayland opengl vulkan webengine"
-GPULESS_FEATURES_imxgpu = ""
+GPULESS_FEATURES:imxgpu = ""
 DISTRO_FEATURES:remove = "${GPULESS_FEATURES}"
 
 # Suitable DRI device
-DRI_DEVICE_apalis-imx6 = "card1"
-DRI_DEVICE_colibri-imx6 = "card1"
-DRI_DEVICE_colibri-imx7-emmc = "card0"
-DRI_DEVICE_apalis-imx8 = "card1"
-DRI_DEVICE_apalis-imx8x = "card0"
-DRI_DEVICE_colibri-imx8x = "card1"
-DRI_DEVICE_colibri-imx8x-v10b = "card1"
-DRI_DEVICE_verdin-imx8mm = "card0"
-DRI_DEVICE_verdin-imx8mp = "card0"
+DRI_DEVICE:apalis-imx6 = "card1"
+DRI_DEVICE:colibri-imx6 = "card1"
+DRI_DEVICE:colibri-imx7-emmc = "card0"
+DRI_DEVICE:apalis-imx8 = "card1"
+DRI_DEVICE:apalis-imx8x = "card0"
+DRI_DEVICE:colibri-imx8x = "card1"
+DRI_DEVICE:colibri-imx8x-v10b = "card1"
+DRI_DEVICE:verdin-imx8mm = "card0"
+DRI_DEVICE:verdin-imx8mp = "card0"
 
 # remove support for 256MB version colibri-imx6ull in tezi image, since image will be too large for it.
-TORADEX_PRODUCT_IDS:remove_colibri-imx6ull = "0036"
+TORADEX_PRODUCT_IDS:remove:colibri-imx6ull = "0036"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend
index e1840b90..0915ba8a 100644
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-RRECOMMENDS:${PN}_use-nxp-bsp = "libvulkan-imx"
+RRECOMMENDS:${PN}:use-nxp-bsp = "libvulkan-imx"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
index 65f23830..da56fa6b 100644
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
@@ -39,14 +39,14 @@ do_configure:append() {
     echo "QT_QPA_EGLFS_FORCEVSYNC=1" >> ${WORKDIR}/defaults
 }
 
-do_configure:append_mx8() {
+do_configure:append:mx8() {
     echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults
     echo "QT_QPA_EGLFS_KMS_ATOMIC=1" >> ${WORKDIR}/defaults
     echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults
     sed -e 's/@DEVICE@/${DRI_DEVICE}/' ${WORKDIR}/kms.conf.in > ${WORKDIR}/kms.conf
 }
 
-do_configure:append_use-mainline-bsp() {
+do_configure:append:use-mainline-bsp() {
     echo "QT_QPA_EGLFS_KMS_ATOMIC=1" >> ${WORKDIR}/defaults
     echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults
     sed -e 's/@DEVICE@/${DRI_DEVICE}/' ${WORKDIR}/kms.conf.in > ${WORKDIR}/kms.conf
@@ -58,7 +58,7 @@ do_install:append() {
     fi
 }
 
-do_configure:append_mx8mm() {
+do_configure:append:mx8mm() {
     # QtWebEngine screen tearing issues with imx8mm (QTBUG-80665)
     echo "QTWEBENGINE_DISABLE_GPU_THREAD=1" >> ${WORKDIR}/defaults
 }
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend
index fec0402d..bb95d2aa 100644
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/qt6/qtbase_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
 
-PACKAGECONFIG:append_mx8 = " gbm kms"
-PACKAGECONFIG:append_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' gbm kms', '', d)}"
+PACKAGECONFIG:append:mx8 = " gbm kms"
+PACKAGECONFIG:append:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' gbm kms', '', d)}"
diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
index 9ed5fd79..9c42dbf6 100644
--- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-do_deploy:append_raspberrypi4() {
+do_deploy:append:raspberrypi4() {
     echo "# enable both hdmi outputs" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
     echo "max_framebuffers=2" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
 }
diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend
index f8ec936b..3c700372 100644
--- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-graphics/wayland/weston_%.bbappend
@@ -28,4 +28,4 @@
 ############################################################################
 
 # from https://www.mail-archive.com/yocto@yoctoproject.org/msg33193.html
-PACKAGECONFIG:remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'kms', d)}"
+PACKAGECONFIG:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'kms', d)}"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend
index a0d2cc4d..a37e0fa7 100644
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/packagegroups/packagegroup-b2qt-embedded-base.bbappend
@@ -29,8 +29,8 @@
 
 # try to limit the maximum size of the tezi image
 FIRMWARE ?= ""
-FIRMWARE_colibri-imx6ull = "linux-firmware"
-FIRMWARE_colibri-imx7 = "linux-firmware"
-FIRMWARE_colibri-imx7-emmc = "linux-firmware"
+FIRMWARE:colibri-imx6ull = "linux-firmware"
+FIRMWARE:colibri-imx7 = "linux-firmware"
+FIRMWARE:colibri-imx7-emmc = "linux-firmware"
 
 RDEPENDS:${PN}:remove = "${FIRMWARE}"
diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
index 305d5dff..90e8fd42 100644
--- a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend
@@ -29,4 +29,4 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append_apalis-imx6 = " file://0001-Increase-default-playback-volume.patch"
+SRC_URI:append:apalis-imx6 = " file://0001-Increase-default-playback-volume.patch"
diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 565f9ac4..dc18c0c8 100644
--- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -29,4 +29,4 @@
 
 PACKAGECONFIG:append = " faad"
 
-PACKAGECONFIG_GL_imxpxp = ""
+PACKAGECONFIG_GL:imxpxp = ""
diff --git a/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb b/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb
index 8bf9ac5f..00787a63 100644
--- a/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb
+++ b/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb
@@ -11,4 +11,4 @@ SRC_URI[sha256sum] = "fba17b343c011410584330d8e268d09f449d16d62007b1a797751721a5
 
 # Enable OPUS by default
 PACKAGECONFIG += "opus portaudio"
-PACKAGECONFIG:append_intel-x86-common = " kittai "
+PACKAGECONFIG:append:intel-x86-common = " kittai "