Convert to new override syntax

Use the convert-overrides.py to convert to new syntax and manually fix some additional changes. Signed-off-by: Anuj Mittal <[email protected]>
distro-core-curated-mirrors · Jul 31, 2021 · 0584f63 · 0584f63
1 parent 7a5e47b
commit 0584f63
Show file tree

Hide file tree

Showing 62 changed files with 264 additions and 264 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -64,7 +64,7 @@ without having to use hardware. The virtio drivers are added via
 KERNEL_FEATURES_INTEL_COMMON. This prevents them from being added to
 custom kernels by default. They can be removed by adding the
 following to a conf or kernel bbappend file:
-  KERNEL_FEATURES_INTEL_COMMON_remove = “cfg/virtio.scc”
+  KERNEL_FEATURES_INTEL_COMMON:remove = “cfg/virtio.scc”
 OVMF firmware is also built and can be used in order to emulate a UEFI
 environment. A full runqemu command line for intel-corei7-64 could look
 like this:
@@ -84,4 +84,4 @@ setting, it will not work in as the primary MACHINE tune as the bootloader needs
 to be built as a 64bit binary. The setup for this would be as follows:
   require conf/multilib.conf
   MULTILIBS = "multilib:libx32
-  DEFAULTTUNE_virtclass-multilib-libx32 = "corei7-64-x32"
+  DEFAULTTUNE:virtclass-multilib-libx32 = "corei7-64-x32"
diff --git a/README b/README
@@ -206,12 +206,12 @@ based installer image instead of default wic image. To build it, you need to
 add below configuration to local.conf :
 
   WKS_FILE = "image-installer.wks.in"
-  IMAGE_FSTYPES_append = " ext4"
+  IMAGE_FSTYPES:append = " ext4"
   IMAGE_TYPEDEP_wic = "ext4"
   INITRD_IMAGE_LIVE="core-image-minimal-initramfs"
   do_image_wic[depends] += "${INITRD_IMAGE_LIVE}:do_image_complete"
   do_rootfs[depends] += "virtual/kernel:do_deploy"
-  IMAGE_BOOT_FILES_append = "\
+  IMAGE_BOOT_FILES:append = "\
       ${KERNEL_IMAGETYPE} \
       microcode.cpio \
       ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext4;rootfs.img \

diff --git a/classes/uefi-comboapp.bbclass b/classes/uefi-comboapp.bbclass
@@ -4,8 +4,8 @@
 # it with the efi stub obtained from systemd-boot.
 
 # Don't add syslinux or build an ISO
-PCBIOS_forcevariable = "0"
-NOISO_forcevariable  = "1"
+PCBIOS:forcevariable = "0"
+NOISO:forcevariable  = "1"
 
 # image-live.bbclass will default INITRD_LIVE to the image INITRD_IMAGE creates.
 # We want behavior to be consistent whether or not "live" is in IMAGE_FSTYPES, so
@@ -138,7 +138,7 @@ build_efi_cfg() {
     :
 }
 
-populate_kernel_append() {
+populate_kernel:append() {
     # The kernel and initrd are built into the app, so we don't need these
     if [ -f $dest/initrd ]; then
         rm $dest/initrd

diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
@@ -1,54 +1,54 @@
 # This file contains a list of recipe maintainers for meta-intel
 
-RECIPE_MAINTAINER_pn-backport-iwlwifi = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-core-image-rt = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-core-image-tiny = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-core-image-minimal-initramfs = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-embree = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-gmmlib = "Lim Siew Hoon <[email protected]>"
-RECIPE_MAINTAINER_pn-hdcp = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-intel-graphics-compiler = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-intel-compute-runtime = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-intel-media-driver = "Lim Siew Hoon <[email protected]>"
-RECIPE_MAINTAINER_pn-intel-mediasdk = "Lim Siew Hoon <[email protected]>"
-RECIPE_MAINTAINER_pn-intel-microcode = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-intel-vaapi-driver = "Lim Siew Hoon <[email protected]>"
-RECIPE_MAINTAINER_pn-ipmctl = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-isa-l = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-ispc = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-itt = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-ixgbe = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-ixgbevf = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-iucode-tool = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-jhi = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-level-zero = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-libipt = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-libyami = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-libyami-utils = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-libxcam = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-linux-intel = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-linux-intel-rt = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-linux-intel-dev = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-lms = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-metee = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-metrics-discovery = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-oidn = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-onednn = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-onedpl = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-onevpl = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-onevpl-intel-gpu = "Yew Chang Ching <[email protected]>"
-RECIPE_MAINTAINER_pn-open-model-zoo = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-opencl-clang = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-openvino-inference-engine = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-openvino-model-optimizer = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-openvkl = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-ospray = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-ovmf-shell-image-enrollkeys = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-rkcommon = "Naveen Saini <[email protected]>"
-RECIPE_MAINTAINER_pn-sbsigntool-native = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-secureboot-selftest-image-signed = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-secureboot-selftest-image-unsigned = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-zlib-intel = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-backport-iwlwifi = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-core-image-rt = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-core-image-rt-sdk = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-core-image-tiny = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-embree = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <[email protected]>"
+RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <[email protected]>"
+RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <[email protected]>"
+RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon <[email protected]>"
+RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-isa-l = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-ispc = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-itt = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-jhi = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-libyami = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-libyami-utils = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-linux-intel-dev = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-lms = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-metee = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-metrics-discovery = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-oidn = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-onednn = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-onedpl = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-onevpl = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-onevpl-intel-gpu = "Yew Chang Ching <[email protected]>"
+RECIPE_MAINTAINER:pn-open-model-zoo = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-opencl-clang = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-openvino-inference-engine = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-openvino-model-optimizer = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-openvkl = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-ospray = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-ovmf-shell-image-enrollkeys = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-rkcommon = "Naveen Saini <[email protected]>"
+RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-zlib-intel = "Naveen Saini <[email protected]>"
diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc
@@ -1,15 +1,15 @@
 INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common"
-PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_ARCH:pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
+PACKAGE_EXTRA_ARCHS:append += "${INTEL_COMMON_PACKAGE_ARCH}"
 MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:"
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
@@ -14,8 +14,8 @@ PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib"
 
 PREFERRED_VERSION_linux-intel ?= "5.10%"
 PREFERRED_VERSION_linux-intel-rt ?= "5.10%"
-PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%"
-PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%"
+PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.4%"
+PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.4%"
 
 # Need to point to latest version of libva needed for media components
 PREFERRED_PROVIDER_libva = "libva-intel"
@@ -35,20 +35,20 @@ XSERVER_X86_ASPEED_AST = "xf86-video-ast \
            "
 
 # include the user space intel microcode loading support in the generated images.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}"
 
 # recommended extra packages common to all intel machines
-MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kernel-module-i915 linux-firmware-i915"
+MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915"
 
 # for the early boot time kernel microcode loading support,
 # merge the microcode data in the final initrd image.
-INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
+INITRD_LIVE:prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
 
 DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef"
 
 EFI_PROVIDER ?= "systemd-boot"
-EFI_PROVIDER_x86-x32 = "grub-efi"
+EFI_PROVIDER:x86-x32 = "grub-efi"
 
 # Add general MACHINEOVERRIDE for meta-intel
 MACHINEOVERRIDES =. "intel-x86-common:"

diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc
@@ -17,15 +17,15 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylak
 # Extra tune selections
 
 AVAILTUNES += "skylake-64"
-TUNE_FEATURES_tune-skylake-64 = "${TUNE_FEATURES_tune-x86-64} skylake"
-BASE_LIB_tune-skylake-64 = "lib64"
-TUNE_PKGARCH_tune-skylake-64 = "skylake-64"
-PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} skylake-64"
+TUNE_FEATURES:tune-skylake-64 = "${TUNE_FEATURES:tune-x86-64} skylake"
+BASE_LIB:tune-skylake-64 = "lib64"
+TUNE_PKGARCH:tune-skylake-64 = "skylake-64"
+PACKAGE_EXTRA_ARCHS:tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} skylake-64"
 QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client"
 
 
 # Disable QEMU usermode by default (get avx2)
-MACHINE_FEATURES_remove = "qemu-usermode"
+MACHINE_FEATURES:remove = "qemu-usermode"
 
 # If qemu-usermode is enabled, we have to disable avx2 ISA extensions, but we can keep mtune as skylake vs generic
 SKYLAKE_TUNE .= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', ' -mtune=skylake ${QEMU_UNAVAILABLE_ISA}', '-mtune=generic -mavx2', d)}"

diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
@@ -29,4 +29,4 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
 WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
-WKS_FILE_DEPENDS_append = " intel-microcode"
+WKS_FILE_DEPENDS:append = " intel-microcode"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "intel-ucode"
 MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi"
 
 # Enable optional dpdk:
-COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64"
+COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
@@ -32,4 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
 WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
-WKS_FILE_DEPENDS_append = " intel-microcode"
+WKS_FILE_DEPENDS:append = " intel-microcode"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "intel-ucode"
 
 MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk gstreamer1.0-vaapi"
 
-COMPATIBLE_MACHINE_pn-dpdk = "intel-skylake-64"
+COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
@@ -32,4 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
 WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
-WKS_FILE_DEPENDS_append = " intel-microcode"
+WKS_FILE_DEPENDS:append = " intel-microcode"
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.3.bb
@@ -25,7 +25,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
 CVE_PRODUCT = "intel:math_kernel_library"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_libc-musl = 'null'
+COMPATIBLE_HOST:libc-musl = 'null'
 
 EXTRA_OECMAKE += " \
                    -DDNNL_LIBRARY_TYPE=SHARED \
@@ -39,7 +39,7 @@ EXTRA_OECMAKE += " \
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime"
 
-do_install_append () {
+do_install:append () {
     install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs
     install -m 0755 ${B}/tests/benchdnn/benchdnn ${D}${bindir}/mkl-dnn/tests/benchdnn
     cp -r ${B}/tests/benchdnn/inputs/* ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs
@@ -53,4 +53,4 @@ do_install_ptest () {
 
 PACKAGES =+ "${PN}-test"
 
-FILES_${PN}-test = "${bindir}/mkl-dnn/*"
+FILES:${PN}-test = "${bindir}/mkl-dnn/*"
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.16.0.bb b/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.16.0.bb
@@ -21,7 +21,7 @@ SRCREV = "bdd411085d3e398cf7927cb3b94b00af676737ba"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 
 DEPENDS += " clang-native bison-native "
-RDEPENDS_${PN} += " clang-libllvm clang"
+RDEPENDS:${PN} += " clang-libllvm clang"
 
 EXTRA_OECMAKE += " \
                   -DISPC_INCLUDE_TESTS=OFF  \

diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:"
 
 SPIRV10_SRCREV = "576abae62cecd171992017a4a786e3831221ab8d"
 SPIRV11_SRCREV = "2a8c1e6c9778deaa720a23e08c293006dc5d56fd"
@@ -34,8 +34,8 @@ SPIRV_LLVM11_SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;
 
 
 
-SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '10.0.1', ' ${SPIRV_LLVM10_SRC_URI} ${SRC_URI_LLVM10_PATCHES} ', '', d)}"
-SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '11.1.0', ' ${SPIRV_LLVM11_SRC_URI} ${SRC_URI_LLVM11_PATCHES} ', '', d)}"
-SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}"
+SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '10.0.1', ' ${SPIRV_LLVM10_SRC_URI} ${SRC_URI_LLVM10_PATCHES} ', '', d)}"
+SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '11.1.0', ' ${SPIRV_LLVM11_SRC_URI} ${SRC_URI_LLVM11_PATCHES} ', '', d)}"
+SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}"
 
 SRCREV_spirv = "${@bb.utils.contains_any('LLVMVERSION', [ '13.0.0', '12.0.0' ], '', '${SPIRV_SRCREV}', d)}"