42 files changed, 431 insertions, 431 deletions
diff --git a/.github/workflows/yoe.yml b/.github/workflows/yoe.yml
index ca2885b..133f74b 100644
--- a/.github/workflows/yoe.yml
+++ b/.github/workflows/yoe.yml
@@ -50,7 +50,7 @@ jobs:
          echo BB_NUMBER_THREADS = \"16\" >> conf/local.conf
          echo PARALLEL_MAKE = \"-j 32\" >> conf/local.conf
          echo CLANGSDK = \"1\" >> conf/local.conf
-          echo IMAGE_INSTALL_append = \" clang \" >> conf/local.conf
+          echo IMAGE_INSTALL:append = \" clang \" >> conf/local.conf
          echo XZ_DEFAULTS = \"--threads=8\" >> conf/local.conf
          echo SDKMACHINE = \"aarch64\" >> conf/local.conf
          /bin/bash -c "sed -i -e 's/PACKAGE_FEED_URI.*$//' conf/site.conf"
@@ -67,7 +67,7 @@ jobs:
        run: |
          cd yoe
          export DISPLAY=":0"
-          echo TESTIMAGE_AUTO_qemuall = \"1\" >> conf/local.conf
+          echo TESTIMAGE_AUTO:qemuall = \"1\" >> conf/local.conf
          /bin/bash -c ". ./qemuarm64-envsetup.sh && bitbake yoe-sdk-image"
      - name: Prepare results
        run: |
diff --git a/README.md b/README.md
index 3aa42da..698ae3a 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ in `local.conf`.
 You can select libstdc++ per package too by writing bbappends for them containing
 ```shell
-LIBCPLUSPLUS_toolchain-clang_pn-<recipe> = "-stdlibc=libc++"
+LIBCPLUSPLUS:toolchain-clang:pn-<recipe> = "-stdlibc=libc++"
 ```
 Defaults are chosen to be GNU for maximum compatibility with existing GNU systems. Its always
 good to use single runtime on a system, mixing runtimes can cause complications during
@@ -119,7 +119,7 @@ Few components do not build with clang, if you have a component to add to that l
 simply add it to `conf/nonclangable.inc` e.g.
 ```shell
-TOOLCHAIN_pn-<recipe> = "gcc"
+TOOLCHAIN:pn-<recipe> = "gcc"
 ```
 and OE will start using gcc to cross compile that recipe.
@@ -127,7 +127,7 @@ and OE will start using gcc to cross compile that recipe.
 if a component does not build with libc++, you can add it to `conf/nonclangable.inc` e.g.
 ```shell
-CXX_remove_pn-<recipe>_toolchain-clang = " -stdlib=libc++ "
+CXX:remove:pn-<recipe>_toolchain-clang = " -stdlib=libc++ "
 ```
 # compiler-rt failing in do_configure with custom TARGET_VENDOR
diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index e642d0d..8825c15 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -1,90 +1,90 @@
 # Add the necessary override
-CCACHE_COMPILERCHECK_toolchain-clang ?= "%compiler% -v"
+CCACHE_COMPILERCHECK:toolchain-clang ?= "%compiler% -v"
-HOST_CC_ARCH_prepend_toolchain-clang = "-target ${HOST_SYS} "
+HOST_CC_ARCH:prepend:toolchain-clang = "-target ${HOST_SYS} "
-CC_toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+CC:toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CXX_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+CXX:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CPP_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -E"
+CPP:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -E"
-CCLD_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+CCLD:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-RANLIB_toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
+RANLIB:toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
-AR_toolchain-clang = "${HOST_PREFIX}llvm-ar"
+AR:toolchain-clang = "${HOST_PREFIX}llvm-ar"
-NM_toolchain-clang = "${HOST_PREFIX}llvm-nm"
+NM:toolchain-clang = "${HOST_PREFIX}llvm-nm"
-LTO_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
+LTO:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
-PACKAGE_DEBUG_SPLIT_STYLE_toolchain-clang = "debug-without-src"
+PACKAGE_DEBUG_SPLIT_STYLE:toolchain-clang = "debug-without-src"
 COMPILER_RT ??= ""
-COMPILER_RT_class-native = "-rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT:class-native = "-rtlib=libgcc ${UNWINDLIB}"
-COMPILER_RT_powerpc = "-rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT:powerpc = "-rtlib=libgcc ${UNWINDLIB}"
-COMPILER_RT_armeb = "-rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT:armeb = "-rtlib=libgcc ${UNWINDLIB}"
 COMPILER_RT_libc-klibc = "-rtlib=libgcc ${UNWINDLIB}"
 UNWINDLIB ??= ""
-UNWINDLIB_class-native = "--unwindlib=libgcc"
+UNWINDLIB:class-native = "--unwindlib=libgcc"
-UNWINDLIB_powerpc = "--unwindlib=libgcc"
+UNWINDLIB:powerpc = "--unwindlib=libgcc"
-UNWINDLIB_armeb = "--unwindlib=libgcc"
+UNWINDLIB:armeb = "--unwindlib=libgcc"
 UNWINDLIB_libc-klibc = "--unwindlib=libgcc"
 LIBCPLUSPLUS ??= ""
-CXXFLAGS_append_toolchain-clang = " ${LIBCPLUSPLUS}"
+CXXFLAGS:append:toolchain-clang = " ${LIBCPLUSPLUS}"
-LDFLAGS_append_toolchain-clang = " ${COMPILER_RT} ${LIBCPLUSPLUS}"
+LDFLAGS:append:toolchain-clang = " ${COMPILER_RT} ${LIBCPLUSPLUS}"
-TUNE_CCARGS_remove_toolchain-clang = "-meb"
+TUNE_CCARGS:remove:toolchain-clang = "-meb"
-TUNE_CCARGS_remove_toolchain-clang = "-mel"
+TUNE_CCARGS:remove:toolchain-clang = "-mel"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
+TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
 # Clang does not yet support big.LITTLE performance tunes, so use the LITTLE for tunes
-TUNE_CCARGS_remove_toolchain-clang = "-mcpu=cortex-a57.cortex-a53 -mcpu=cortex-a72.cortex-a53 -mcpu=cortex-a15.cortex-a7 -mcpu=cortex-a17.cortex-a7 -mcpu=cortex-a72.cortex-a35 -mcpu=cortex-a73.cortex-a53 -mcpu=cortex-a75.cortex-a55 -mcpu=cortex-a76.cortex-a55"
+TUNE_CCARGS:remove:toolchain-clang = "-mcpu=cortex-a57.cortex-a53 -mcpu=cortex-a72.cortex-a53 -mcpu=cortex-a15.cortex-a7 -mcpu=cortex-a17.cortex-a7 -mcpu=cortex-a72.cortex-a35 -mcpu=cortex-a73.cortex-a53 -mcpu=cortex-a75.cortex-a55 -mcpu=cortex-a76.cortex-a55"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa53 cortexa57-cortexa53 cortexa73-cortexa53", " -mcpu=cortex-a53", "", d)}"
+TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa53 cortexa57-cortexa53 cortexa73-cortexa53", " -mcpu=cortex-a53", "", d)}"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa15-cortexa7 cortexa17-cortexa7", " -mcpu=cortex-a7", "", d)}"
+TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa15-cortexa7 cortexa17-cortexa7", " -mcpu=cortex-a7", "", d)}"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa35", " -mcpu=cortex-a35", "", d)}"
+TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa35", " -mcpu=cortex-a35", "", d)}"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa75-cortex-a55 cortexa76-cortex-a55", " -mcpu=cortex-a55", "", d)}"
+TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa75-cortex-a55 cortexa76-cortex-a55", " -mcpu=cortex-a55", "", d)}"
 # Clang does not support octeontx2 processor
-TUNE_CCARGS_remove_toolchain-clang = "-mcpu=octeontx2"
+TUNE_CCARGS:remove:toolchain-clang = "-mcpu=octeontx2"
 # LLD does not yet support relaxation for RISCV e.g. https://reviews.freebsd.org/D25210
-TUNE_CCARGS_append_toolchain-clang_riscv32 = " -mno-relax"
+TUNE_CCARGS:append:toolchain-clang:riscv32 = " -mno-relax"
-TUNE_CCARGS_append_toolchain-clang_riscv64 = " -mno-relax"
+TUNE_CCARGS:append:toolchain-clang:riscv64 = " -mno-relax"
-TUNE_CCARGS_remove_toolchain-clang_powerpc = "-mhard-float"
+TUNE_CCARGS:remove:toolchain-clang:powerpc = "-mhard-float"
-TUNE_CCARGS_remove_toolchain-clang_powerpc = "-mno-spe"
+TUNE_CCARGS:remove:toolchain-clang:powerpc = "-mno-spe"
-TUNE_CCARGS_append_toolchain-clang = " -Qunused-arguments"
+TUNE_CCARGS:append:toolchain-clang = " -Qunused-arguments"
-TUNE_CCARGS_append_toolchain-clang_libc-musl_powerpc64 = " -mlong-double-64"
+TUNE_CCARGS:append:toolchain-clang:libc-musl:powerpc64 = " -mlong-double-64"
-TUNE_CCARGS_append_toolchain-clang_libc-musl_powerpc64le = " -mlong-double-64"
+TUNE_CCARGS:append:toolchain-clang:libc-musl:powerpc64le = " -mlong-double-64"
 # usrmerge workaround
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-prefix=/usr", "", d)}"
+TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-prefix=/usr", "", d)}"
-LDFLAGS_append_toolchain-clang_class-nativesdk_x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2"
+LDFLAGS:append:toolchain-clang:class-nativesdk:x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2"
-LDFLAGS_append_toolchain-clang_class-nativesdk_x86 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux.so.2"
+LDFLAGS:append:toolchain-clang:class-nativesdk:x86 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux.so.2"
-LDFLAGS_append_toolchain-clang_class-nativesdk_aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"
+LDFLAGS:append:toolchain-clang:class-nativesdk:aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"
-LDFLAGS_toolchain-clang_class-nativesdk = "${BUILDSDK_LDFLAGS} \
+LDFLAGS:toolchain-clang:class-nativesdk = "${BUILDSDK_LDFLAGS} \
                                           -Wl,-rpath-link,${STAGING_LIBDIR}/.. \
                                           -Wl,-rpath,${libdir}/.. "
 # Enable lld globally"
-LDFLAGS_append_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
+LDFLAGS:append:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
 # choose between 'gcc' 'clang' an empty '' can be used as well
 TOOLCHAIN ??= "gcc"
 # choose between 'gnu' 'llvm'
 RUNTIME ??= "gnu"
 #RUNTIME_toolchain-gcc = "gnu"
-RUNTIME_armeb = "gnu"
+RUNTIME:armeb = "gnu"
-TOOLCHAIN_class-native = "gcc"
+TOOLCHAIN:class-native = "gcc"
-TOOLCHAIN_class-nativesdk = "gcc"
+TOOLCHAIN:class-nativesdk = "gcc"
-TOOLCHAIN_class-cross-canadian = "gcc"
+TOOLCHAIN:class-cross-canadian = "gcc"
-TOOLCHAIN_class-crosssdk = "gcc"
+TOOLCHAIN:class-crosssdk = "gcc"
-TOOLCHAIN_class-cross = "gcc"
+TOOLCHAIN:class-cross = "gcc"
 OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}"
 OVERRIDES =. "${@['', 'runtime-${RUNTIME}:']['${RUNTIME}' != '']}"
 OVERRIDES[vardepsexclude] += "TOOLCHAIN RUNTIME"
-#DEPENDS_append_toolchain-clang_class-target = " clang-cross-${TARGET_ARCH} "
+#DEPENDS_append_toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
 #DEPENDS_remove_toolchain-clang_allarch = "clang-cross-${TARGET_ARCH}"
 def clang_base_deps(d):
@@ -108,8 +108,8 @@ def clang_base_deps(d):
            return ret
    return ""
-BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_base_deps(d)}"
+BASE_DEFAULT_DEPS:toolchain-clang:class-target = "${@clang_base_deps(d)}"
-BASE_DEFAULT_DEPS_append_class-native_toolchain-clang_runtime-llvm = " libcxx-native compiler-rt-native"
+BASE_DEFAULT_DEPS:append:class-native:toolchain-clang_runtime-llvm = " libcxx-native compiler-rt-native"
 cmake_do_generate_toolchain_file_append_toolchain-clang () {
    cat >> ${WORKDIR}/toolchain.cmake <<EOF
diff --git a/classes/scan-build.bbclass b/classes/scan-build.bbclass
index 9c0c742..2494ccd 100644
--- a/classes/scan-build.bbclass
+++ b/classes/scan-build.bbclass
@@ -4,11 +4,11 @@
 EXTRA_ANALYZER_OPTIONS += "-analyze-headers"
 EXTRA_ANALYZER_OPTIONS += "--force-analyze-debug-code"
 SCAN_BUILD ??= "1"
-SCAN_BUILD_class-native = ""
+SCAN_BUILD:class-native = ""
-SCAN_BUILD_class-nativesdk = ""
+SCAN_BUILD:class-nativesdk = ""
-SCAN_BUILD_class-cross = ""
+SCAN_BUILD:class-cross = ""
-SCAN_BUILD_class-crosssdk = ""
+SCAN_BUILD:class-crosssdk = ""
-SCAN_BUILD_class-cross-canadian = ""
+SCAN_BUILD:class-cross-canadian = ""
 #CLANG_SCAN_SERVER_IP ??= "127.0.0.1"
 CLANG_SCAN_SERVER_IP ??= "10.0.0.10"
@@ -16,7 +16,7 @@ CLANG_SCAN_PORT ??= "8181"
 SCAN_RESULTS_DIR ?= "${TMPDIR}/static-scan/${PN}"
 CCSCAN ?= "${HOST_PREFIX}${TOOLCHAIN}"
-CXXSCAN_toolchain-clang ?= "${HOST_PREFIX}clang++"
+CXXSCAN:toolchain-clang ?= "${HOST_PREFIX}clang++"
 CXXSCAN_toolchain-gcc ?= "${HOST_PREFIX}g++"
 do_scanbuild() {
diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 2f3775d..2ec0bbf 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -1,113 +1,113 @@
 #babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so has relocations in .text [textrel]
-TOOLCHAIN_pn-babeltrace2 = "gcc"
+TOOLCHAIN:pn-babeltrace2 = "gcc"
-TOOLCHAIN_pn-u-boot = "gcc"
+TOOLCHAIN:pn-u-boot = "gcc"
-TOOLCHAIN_pn-cpufrequtils = "gcc"
+TOOLCHAIN:pn-cpufrequtils = "gcc"
 # crash embeds version of gdb which is not buildable with clang
-TOOLCHAIN_pn-crash = "gcc"
+TOOLCHAIN:pn-crash = "gcc"
-TOOLCHAIN_pn-elfutils = "gcc"
+TOOLCHAIN:pn-elfutils = "gcc"
 # /mnt/a/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/firefox/60.1.0esr-r0/recipe-sysroot-native/usr/lib/clang/7.0.1/include/arm_neon.h:433:1: error: unknown type name 'inline'
 # __ai uint8x16_t vabdq_u8(uint8x16_t __p0, uint8x16_t __p1) {
-TOOLCHAIN_pn-firefox = "gcc"
+TOOLCHAIN:pn-firefox = "gcc"
-TOOLCHAIN_pn-gcc = "gcc"
+TOOLCHAIN:pn-gcc = "gcc"
-TOOLCHAIN_pn-gcc-runtime = "gcc"
+TOOLCHAIN:pn-gcc-runtime = "gcc"
-TOOLCHAIN_pn-gcc-sanitizers = "gcc"
+TOOLCHAIN:pn-gcc-sanitizers = "gcc"
-TOOLCHAIN_pn-glibc = "gcc"
+TOOLCHAIN:pn-glibc = "gcc"
-TOOLCHAIN_pn-glibc-initial = "gcc"
+TOOLCHAIN:pn-glibc-initial = "gcc"
-TOOLCHAIN_pn-glibc-locale = "gcc"
+TOOLCHAIN:pn-glibc-locale = "gcc"
-TOOLCHAIN_pn-glibc-mtrace = "gcc"
+TOOLCHAIN:pn-glibc-mtrace = "gcc"
-TOOLCHAIN_pn-glibc-scripts = "gcc"
+TOOLCHAIN:pn-glibc-scripts = "gcc"
-TOOLCHAIN_pn-glibc-testsuite = "gcc"
+TOOLCHAIN:pn-glibc-testsuite = "gcc"
-TOOLCHAIN_pn-grub = "gcc"
+TOOLCHAIN:pn-grub = "gcc"
-TOOLCHAIN_pn-grub-efi = "gcc"
+TOOLCHAIN:pn-grub-efi = "gcc"
 #| prelink-rtld: error while loading shared libraries: ld.so.1
 #| /lib64/ld.so.1: No such file or directory
-TOOLCHAIN_pn-gobject-intospection_mips64 = "gcc"
+TOOLCHAIN:pn-gobject-intospection:mips64 = "gcc"
-TOOLCHAIN_pn-avahi_mips64 = "gcc"
+TOOLCHAIN:pn-avahi:mips64 = "gcc"
 # VLAs
 #| control.c:286:19: error: fields must have a constant size: 'variable length array in structure' extension will never be supported
 #|             __u32 buffer[cam->max_response_quads];
 #|                   ^
 #| 1 error generated.
-TOOLCHAIN_pn-libdc1394 = "gcc"
+TOOLCHAIN:pn-libdc1394 = "gcc"
 # error: return address can be determined only for current frame
-TOOLCHAIN_pn-libexecinfo_mipsarch = "gcc"
+TOOLCHAIN:pn-libexecinfo:mipsarch = "gcc"
-TOOLCHAIN_pn-libgcc = "gcc"
+TOOLCHAIN:pn-libgcc = "gcc"
-TOOLCHAIN_pn-libgcc-initial = "gcc"
+TOOLCHAIN:pn-libgcc-initial = "gcc"
-TOOLCHAIN_pn-libgfortran = "gcc"
+TOOLCHAIN:pn-libgfortran = "gcc"
-TOOLCHAIN_pn-libssp-nonshared = "gcc"
+TOOLCHAIN:pn-libssp-nonshared = "gcc"
 # ell 0.39 introduced nested functions sadly
-TOOLCHAIN_pn-ell = "gcc"
+TOOLCHAIN:pn-ell = "gcc"
 # iwd 1.13 introduced nested functions sadly
-TOOLCHAIN_pn-iwd = "gcc"
+TOOLCHAIN:pn-iwd = "gcc"
 #| cargo:warning=/mnt/a/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/libstd-rs/1.27.1-r0/re
 #cipe-sysroot/usr/include/bits/stdlib.h:90:3: error: "Assumed value of MB_LEN_MAX wrong"
 #| cargo:warning=# error "Assumed value of MB_LEN_MAX wrong"
 #| cargo:warning=  ^
-TOOLCHAIN_pn-libstd-rs = "gcc"
+TOOLCHAIN:pn-libstd-rs = "gcc"
-TOOLCHAIN_pn-m4_powerpc = "gcc"
+TOOLCHAIN:pn-m4:powerpc = "gcc"
 # clang does not have 64bit atomics on mips32
-#TOOLCHAIN_pn-mesa_mips = "gcc"
+#TOOLCHAIN_pn-mesa:mips = "gcc"
-#TOOLCHAIN_pn-mesa_mipsel = "gcc"
+#TOOLCHAIN_pn-mesa:mipsel = "gcc"
-TOOLCHAIN_pn-mesa_riscv64 = "gcc"
+TOOLCHAIN:pn-mesa:riscv64 = "gcc"
-TOOLCHAIN_pn-mesa_powerpc = "gcc"
+TOOLCHAIN:pn-mesa:powerpc = "gcc"
 # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments
-TOOLCHAIN_pn-omxplayer = "gcc"
+TOOLCHAIN:pn-omxplayer = "gcc"
 # error: return address can be determined only for current frame
-TOOLCHAIN_pn-openflow_mipsarch = "gcc"
+TOOLCHAIN:pn-openflow:mipsarch = "gcc"
-TOOLCHAIN_pn-opensbi = "gcc"
+TOOLCHAIN:pn-opensbi = "gcc"
-TOOLCHAIN_pn-openjdk-8 = "gcc"
+TOOLCHAIN:pn-openjdk-8 = "gcc"
-TOOLCHAIN_pn-openjre-8 = "gcc"
+TOOLCHAIN:pn-openjre-8 = "gcc"
-TOOLCHAIN_pn-piglit = "gcc"
+TOOLCHAIN:pn-piglit = "gcc"
-TOOLCHAIN_pn-prelink = "gcc"
+TOOLCHAIN:pn-prelink = "gcc"
 # Qemu cant run profile tests run during build
 # | *** stack smashing detected ***: terminated
 # | ./pgo-wrapper: line 3: 3372346 Aborted
-TOOLCHAIN_pn-python3 = "gcc"
+TOOLCHAIN:pn-python3 = "gcc"
 # has dpkg source which does not compile
-TOOLCHAIN_pn-start-stop-daemon = "gcc"
+TOOLCHAIN:pn-start-stop-daemon = "gcc"
-TOOLCHAIN_pn-syslinux = "gcc"
+TOOLCHAIN:pn-syslinux = "gcc"
-TOOLCHAIN_pn-systemtap = "gcc"
+TOOLCHAIN:pn-systemtap = "gcc"
 # v4l-utils uses nested functions
-TOOLCHAIN_pn-v4l-utils = "gcc"
+TOOLCHAIN:pn-v4l-utils = "gcc"
-TOOLCHAIN_pn-valgrind = "gcc"
+TOOLCHAIN:pn-valgrind = "gcc"
 # uses C++ which clang does not like
-TOOLCHAIN_pn-wvstreams = "gcc"
+TOOLCHAIN:pn-wvstreams = "gcc"
-TOOLCHAIN_pn-wvdial = "gcc"
+TOOLCHAIN:pn-wvdial = "gcc"
 #| ../../mpfr-3.1.4/src/mul.c:324:11: error: invalid output constraint '=h' in asm
 #|           umul_ppmm (tmp[1], tmp[0], MPFR_MANT (b)[0], MPFR_MANT (c)[0]);
-TOOLCHAIN_pn-mpfr_mips = "gcc"
+TOOLCHAIN:pn-mpfr:mips = "gcc"
-TOOLCHAIN_pn-mpfr_mips64 = "gcc"
+TOOLCHAIN:pn-mpfr:mips64 = "gcc"
 #
 #../../lib/libicui18n.so: undefined reference to `__atomic_fetch_sub_4'
 #../../lib/libicui18n.so: undefined reference to `__atomic_load_4'
 #../../lib/libicui18n.so: undefined reference to `__atomic_store_4'
 #../../lib/libicui18n.so: undefined reference to `__atomic_fetch_add_4'
 #
-TOOLCHAIN_pn-icu_armv4 = "gcc"
+TOOLCHAIN:pn-icu:armv4 = "gcc"
-TOOLCHAIN_pn-icu_armv5 = "gcc"
+TOOLCHAIN:pn-icu:armv5 = "gcc"
 #../../libgcrypt-1.6.5/mpi/mpih-div.c:98:3: error: invalid use of a cast in a inline asm context requiring an l-value: remove the cast or build with -fheinous-gnu-extensions
-TOOLCHAIN_pn-libgcrypt_mips64 = "gcc"
+TOOLCHAIN:pn-libgcrypt:mips64 = "gcc"
 #| ../../pixman-0.34.0/test/utils-prng.c:131:29: error: cannot convert between vector type '__attribute__((__vector_size__(16 * sizeof(char)))) char' (vector of 16 'char' values) and vector type 'uint8x16' (vector of 16 'uint8_t' values) as implicit conversion would cause truncation
 #|                 randdata.vb |= (t.vb >= const_C0#);
 #|                             ^
 # also see http://lists.llvm.org/pipermail/llvm-dev/2016-October/105997.html
-TOOLCHAIN_pn-pixman = "gcc"
+TOOLCHAIN:pn-pixman = "gcc"
 #recipe-sysroot/usr/include/mozjs-60/mozilla/Span.h:634:5: error: statement not allowed in constexpr function
 #|     MOZ_RELEASE_ASSERT(aStart <= len && (aLength == dynamic_extent ||
 #|     ^
-TOOLCHAIN_pn-polkit = "gcc"
+TOOLCHAIN:pn-polkit = "gcc"
 # ppp uses nested functions and gcc specific option e.g. --print-sysroot
 #
-TOOLCHAIN_pn-ppp = "gcc"
+TOOLCHAIN:pn-ppp = "gcc"
 #| ./ports/linux/pseudo_wrappers.c:80:14: error: use of unknown builtin '__builtin_apply' [-Wimplicit-function-declaration]
 #|         void *res = __builtin_apply((void (*)()) real_syscall, __builtin_apply_args(), sizeof(long) * 7);
@@ -115,18 +115,18 @@ TOOLCHAIN_pn-ppp = "gcc"
 #| ./ports/linux/pseudo_wrappers.c:80:57: error: use of unknown builtin '__builtin_apply_args' [-Wimplicit-function-declaration]
 #|         void *res = __builtin_apply((void (*)()) real_syscall, __builtin_apply_args(), sizeof(long) * 7);
-TOOLCHAIN_pn-pseudo = "gcc"
+TOOLCHAIN:pn-pseudo = "gcc"
 #| ../../pulseaudio-10.0/src/pulsecore/mix_neon.c../../pulseaudio-10.0/src/pulsecore/sconv_neon.c:49::27: error: unknown register name 'q0' in asm
 #|         : "memory", "cc", "q0" /* clobber list */
 #|                           ^
-TOOLCHAIN_pn-pulseaudio_aarch64 = "gcc"
+TOOLCHAIN:pn-pulseaudio:aarch64 = "gcc"
 # mix_neon.c:179:9: error: invalid operand in inline asm: 'vld1.s32 ${0:h}, [$2]
 #      vld1.s32 ${1:h}, [$3] '
-TOOLCHAIN_pn-pulseaudio_armv7ve = "gcc"
+TOOLCHAIN:pn-pulseaudio:armv7ve = "gcc"
-TOOLCHAIN_pn-pulseaudio_armv7a = "gcc"
+TOOLCHAIN:pn-pulseaudio:armv7a = "gcc"
 # clang++ hangs see https://bugs.llvm.org/show_bug.cgi?id=45134
-DEBUG_FLAGS_remove_pn-sqlite-orm_toolchain-clang = "-g"
+DEBUG_FLAGS:remove:pn-sqlite-orm:toolchain-clang = "-g"
 #| /usr/src/debug/qemu/2.6.0-r1/qemu-2.6.0/util/bitmap.c:191: undefined reference to `__atomic_fetch_or_4'
 #| /usr/src/debug/qemu/2.6.0-r1/qemu-2.6.0/util/bitmap.c:210: undefined reference to `__atomic_fetch_or_4'
@@ -136,105 +136,105 @@ DEBUG_FLAGS_remove_pn-sqlite-orm_toolchain-clang = "-g"
 #| /usr/src/debug/qemu/2.6.0-r1/qemu-2.6.0/util/bitmap.c:273: undefined reference to `__atomic_fetch_and_4'
 # We need to link in with -latomic which comes from gcc-runtime anyway so just keep using gcc
 # to compile qemu for target
-TOOLCHAIN_pn-qemu_arm = "gcc"
+TOOLCHAIN:pn-qemu:arm = "gcc"
 #| ./dsp/v4f_IIR2.h:554:12: error: no matching function for call to 'v4f_map'
 #|                                 a[5] = v4f_map<__builtin_cosf> (f);
 #|                                        ^~~~~~~~~~~~~~~~~~~~~~~
-TOOLCHAIN_pn-caps = "gcc"
+TOOLCHAIN:pn-caps = "gcc"
 # Fails to build with clang-13 errors with .export.sym file
 #  Mismatch between symbols in shared library and lists in .exported_symbols.* files: dm_bit_get_prev
-TOOLCHAIN_pn-lvm2 = "gcc"
+TOOLCHAIN:pn-lvm2 = "gcc"
-TOOLCHAIN_pn-libdevmapper = "gcc"
+TOOLCHAIN:pn-libdevmapper = "gcc"
-TOOLCHAIN_pn-lttng-ust_riscv64 = "gcc"
+TOOLCHAIN:pn-lttng-ust:riscv64 = "gcc"
 #| ../libffi-3.3-rc0/src/arm/sysv.S: Assembler messages:
 #| ../libffi-3.3-rc0/src/arm/sysv.S:131: Error: selected processor does not support `vldrle d0,[sp]' in ARM mode
 #| ../libffi-3.3-rc0/src/arm/sysv.S:132: Error: selected processor does not support `vldmgt sp,{d0-d7}' in ARM mode
-TOOLCHAIN_pn-libffi_armeb = "gcc"
+TOOLCHAIN:pn-libffi:armeb = "gcc"
 # Clang/mips still generates __sync_fetch_and_add_8 instead of __atomic_fetch_add_8 so it can't even use
 # libatomic to provide these functions, therefore can not compile redis on mips
-TOOLCHAIN_pn-redis_mips = "gcc"
+TOOLCHAIN:pn-redis:mips = "gcc"
 # rocksdb/rocksdb/util/crc32c_ppc_asm.S:9:10: fatal error: 'ppc-asm.h' file not found
 # #include <ppc-asm.h>
 # This header is only available with gcc-cross
-TOOLCHAIN_pn-mariadb_powerpc64le = "gcc"
+TOOLCHAIN:pn-mariadb:powerpc64le = "gcc"
-CFLAGS_append_pn-liboil_toolchain-clang_x86-64 = " -fheinous-gnu-extensions "
+CFLAGS:append:pn-liboil:toolchain-clang:x86-64 = " -fheinous-gnu-extensions "
 #io_getevents.c:25:141: error: invalid use of a cast in a inline asm context requiring an l-value: remove the cast or build with -fheinous-gnu-extensions
 #io_syscall5(int, __io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout)
-CFLAGS_append_pn-libaio_toolchain-clang_mips = " -fheinous-gnu-extensions"
+CFLAGS:append:pn-libaio:toolchain-clang:mips = " -fheinous-gnu-extensions"
 #| error: unknown warning option '-Wimplicit-fallthrough=0'; did you mean '-Wimplicit-fallthrough'? [-Werror,-Wunknown-warning-option]
-CFLAGS_append_pn-mdadm_toolchain-clang = " -Wno-error=unknown-warning-option"
+CFLAGS:append:pn-mdadm:toolchain-clang = " -Wno-error=unknown-warning-option"
 #../libffi-3.2.1/src/arm/sysv.S:363:2: error: invalid instruction, did you mean: fldmiax?
 # fldmiadgt ip, {d0-d7}
-CFLAGS_append_pn-libffi_arm_toolchain-clang = " -no-integrated-as"
+CFLAGS:append:pn-libffi:arm:toolchain-clang = " -no-integrated-as"
-CFLAGS_append_pn-libffi_mips64_toolchain-clang = " -no-integrated-as"
+CFLAGS:append:pn-libffi:mips64:toolchain-clang = " -no-integrated-as"
 # ../db-5.3.28/src/mutex/mut_tas.c:150:34: error: unknown directive
 #<inline asm>:9:2: note: instantiated into assembly here
 # .force_thumb
 #        ^
-#CFLAGS_append_pn-db_toolchain-clang = " -no-integrated-as"
+#CFLAGS_append_pn-db:toolchain-clang = " -no-integrated-as"
 #
 #| ../../../DirectFB-1.7.7/lib/direct/armasm_memcpy.S:63:2: error: invalid instruction
 #|  ldmgeia r1!, {r3, r4, r12, lr}
 #|  ^
-CFLAGS_append_pn-directfb_toolchain-clang_arm = " -no-integrated-as"
+CFLAGS:append:pn-directfb:toolchain-clang:arm = " -no-integrated-as"
 # Disable internal assembler for armv7 since it uses gnu assmebly syntax
 # which should be preprocessed via gcc/compiler
 #
-CFLAGS_append_pn-openssl_toolchain-clang_armv7ve = " -no-integrated-as"
+CFLAGS:append:pn-openssl:toolchain-clang:armv7ve = " -no-integrated-as"
-CFLAGS_append_pn-openssl_toolchain-clang_armv7a = " -no-integrated-as"
+CFLAGS:append:pn-openssl:toolchain-clang:armv7a = " -no-integrated-as"
 #| crypto/bn/bn-mips.S:671:2: error: unknown instruction, did you mean: bgeu, sgtu, tgeu?
 #|  sgeu $1,$4,$6
 #|  ^
-CC_append_pn-openssl_toolchain-clang_mipsarch = " -no-integrated-as"
+CC:append:pn-openssl:toolchain-clang:mipsarch = " -no-integrated-as"
-CFLAGS_append_pn-userland_toolchain-clang = " -no-integrated-as"
+CFLAGS:append:pn-userland:toolchain-clang = " -no-integrated-as"
 # libjpeg-turbo-2.0.2/simd/mips/jsimd_dspr2.S
 # <instantiation>:13:5: error: invalid token in expression
 # .if $17 != 0
 # ^
-CFLAGS_append_pn-libjpeg-turbo_toolchain-clang_mipsarch = " -no-integrated-as"
+CFLAGS:append:pn-libjpeg-turbo:toolchain-clang:mipsarch = " -no-integrated-as"
 # arm-yoe-linux-gnueabi-ld: /usr/src/debug/libvorbis/1.3.6-r0/build/lib/../../libvorbis-1.3.6/lib/sharedbook.c:165: undefined reference to `__pow_finite'
-CFLAGS_append_pn-libvorbis_toolchain-clang_armv7ve = " -fno-fast-math"
+CFLAGS:append:pn-libvorbis:toolchain-clang:armv7ve = " -fno-fast-math"
-CFLAGS_append_pn-mpg123_toolchain-clang_armv7ve = " -fno-fast-math"
+CFLAGS:append:pn-mpg123:toolchain-clang:armv7ve = " -fno-fast-math"
 #../kexec-tools-2.0.18/purgatory/arch/i386/entry32-16.S:23:2: error: unknown directive
 # .arch i386
 # ^
-CC_append_pn-kexec-tools_toolchain-clang_x86-64 = " -no-integrated-as"
+CC:append:pn-kexec-tools:toolchain-clang:x86-64 = " -no-integrated-as"
-CC_append_pn-kexec-tools_toolchain-clang_x86 = " -no-integrated-as"
+CC:append:pn-kexec-tools:toolchain-clang:x86 = " -no-integrated-as"
-CC_append_pn-kexec-tools-klibc_toolchain-clang_x86-64 = " -no-integrated-as"
+CC:append:pn-kexec-tools-klibc:toolchain-clang:x86-64 = " -no-integrated-as"
-CC_append_pn-kexec-tools-klibc_toolchain-clang_x86 = " -no-integrated-as"
+CC:append:pn-kexec-tools-klibc:toolchain-clang:x86 = " -no-integrated-as"
 #| /tmp/x86-sse2-cdb148.s:207:9: error: ambiguous operand size for instruction 'sub'
 #|     sub SIZE, 64
 #|         ^~~~
-CFLAGS_append_pn-tinymembench_toolchain-clang_x86-64 = " -no-integrated-as"
+CFLAGS:append:pn-tinymembench:toolchain-clang:x86-64 = " -no-integrated-as"
-CFLAGS_append_pn-tinymembench_toolchain-clang_x86 = " -no-integrated-as"
+CFLAGS:append:pn-tinymembench:toolchain-clang:x86 = " -no-integrated-as"
-CFLAGS_append_pn-tinymembench_toolchain-clang_mipsarch = " -no-integrated-as"
+CFLAGS:append:pn-tinymembench:toolchain-clang:mipsarch = " -no-integrated-as"
-CFLAGS_append_pn-ne10_toolchain-clang_arm = " -no-integrated-as"
+CFLAGS:append:pn-ne10:toolchain-clang:arm = " -no-integrated-as"
-CFLAGS_append_pn-libde265_toolchain-clang_arm = " -no-integrated-as"
+CFLAGS:append:pn-libde265:toolchain-clang:arm = " -no-integrated-as"
 # :5 :    error:    unknown directive
 #^
 #    .endfunc
 #    ^
-CFLAGS_append_pn-libsdl2_toolchain-clang_arm = " -no-integrated-as"
+CFLAGS:append:pn-libsdl2:toolchain-clang:arm = " -no-integrated-as"
 #2816:2: error: changed section type for .debug_frame, expected: 0x7000001E
 # .section .debug_frame,"",@progbits
@@ -242,99 +242,99 @@ CFLAGS_append_pn-libsdl2_toolchain-clang_arm = " -no-integrated-as"
 #lj_vm.S:2890:2: error: changed section flags for .eh_frame, expected: 0x2
 # .section .eh_frame,"aw",@progbits
 # ^
-CFLAGS_append_pn-luajit_toolchain-clang_mips = " -no-integrated-as"
+CFLAGS:append:pn-luajit:toolchain-clang:mips = " -no-integrated-as"
 #FAILED: libucontext_posix.so.1
 #clang-13: error: unable to execute command: Segmentation fault (core dumped)
 #clang-13: error: linker command failed due to signal (use -v to see invocation)
-CFLAGS_append_pn-libucontext_toolchain-clang_powerpc64le = " -no-integrated-as"
+CFLAGS:append:pn-libucontext:toolchain-clang:powerpc64le = " -no-integrated-as"
 # Generated asm file can not be compiled with clang assembler due to presence of .0 label
 # and its references
 #| aes-decrypt-internal-2.s:368:1: error: unexpected token at start of statement
 #| .0:
 #| ^
-CFLAGS_append_pn-nettle_toolchain-clang_powerpc64le = " -no-integrated-as"
+CFLAGS:append:pn-nettle:toolchain-clang:powerpc64le = " -no-integrated-as"
 # Fixes clang crash when compiling gnutls-3.7.2/lib/accelerated/aarch64/elf/sha512-armv8.s
-CFLAGS_append_pn-gnutls_toolchain-clang_aarch64 = " -no-integrated-as"
+CFLAGS:append:pn-gnutls:toolchain-clang:aarch64 = " -no-integrated-as"
 # regtest.cc:374:39: error: invalid suffix on literal; C++11 requires a
 # space between literal and identifier [-Wreserved-user-defined-literal]
 #|   snprintf_func (buf, sizeof(buf), "%"Q"u", x);
 #|                                       ^
-CXXFLAGS_append_pn-xdelta3_toolchain-clang = " -Wno-error=reserved-user-defined-literal"
+CXXFLAGS:append:pn-xdelta3:toolchain-clang = " -Wno-error=reserved-user-defined-literal"
 # -fno-tree-vrp is gcc specific
-CXXFLAGS_remove_pn-mozjs_toolchain-clang = "-fno-tree-vrp"
+CXXFLAGS:remove:pn-mozjs:toolchain-clang = "-fno-tree-vrp"
-CFLAGS_remove_pn-mozjs_toolchain-clang = "-fno-tree-vrp"
+CFLAGS:remove:pn-mozjs:toolchain-clang = "-fno-tree-vrp"
 #memcached.c:6280:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive]
-CPPFLAGS_append_pn-memcached_toolchain-clang = " -Wno-error=embedded-directive"
+CPPFLAGS:append:pn-memcached:toolchain-clang = " -Wno-error=embedded-directive"
 #| /tmp/mcp2515-578c41.s: Assembler messages:
 #| /tmp/mcp2515-578c41.s:1525: Error: r13 not allowed here -- `sub.w sp,r1,#8'
 #| /tmp/mcp2515-578c41.s:1821: Error: r13 not allowed here -- `sub.w sp,r6,#8'
 #| clang-7: error: assembler command failed with exit code 1 (use -v to see invocation)
-TUNE_CCARGS_remove_pn-upm_toolchain-clang = "-no-integrated-as"
+TUNE_CCARGS:remove:pn-upm:toolchain-clang = "-no-integrated-as"
-TUNE_CCARGS_remove_pn-omxplayer_toolchain-clang = "-no-integrated-as"
+TUNE_CCARGS:remove:pn-omxplayer:toolchain-clang = "-no-integrated-as"
-TUNE_CCARGS_remove_pn-nfs-utils_toolchain-clang = "-Qunused-arguments"
+TUNE_CCARGS:remove:pn-nfs-utils:toolchain-clang = "-Qunused-arguments"
 # We want to error out when -msse option is used otherwise it enables sse on non-x86 arches
-TUNE_CCARGS_remove_pn-pipewire_toolchain-clang = "-Qunused-arguments"
+TUNE_CCARGS:remove:pn-pipewire:toolchain-clang = "-Qunused-arguments"
-TUNE_CCARGS_remove_pn-tesseract_toolchain-clang = "-Qunused-arguments"
+TUNE_CCARGS:remove:pn-tesseract:toolchain-clang = "-Qunused-arguments"
-TUNE_CCARGS_remove_pn-pulseaudio_toolchain-clang = "-Qunused-arguments"
+TUNE_CCARGS:remove:pn-pulseaudio:toolchain-clang = "-Qunused-arguments"
 #| /usr/src/debug/ruby/2.5.1-r0/build/../ruby-2.5.1/process.c:7073: undefined reference to `__mulodi4'
 #| clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
-COMPILER_RT_pn-ruby_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-ruby:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-python3_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-python3:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-m4_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-m4:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-cpio_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-cpio:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-openssh_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-openssh:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-webkitgtk_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-webkitgtk:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-wpewebkit_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-wpewebkit:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-python3-numpy_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-python3-numpy:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-mongodb_toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-mongodb:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_remove_pn-m4_powerpc = "-rtlib=compiler-rt"
+COMPILER_RT:remove:pn-m4:powerpc = "-rtlib=compiler-rt"
-COMPILER_RT_remove_pn-ruby_powerpc = "-rtlib=compiler-rt"
+COMPILER_RT:remove:pn-ruby:powerpc = "-rtlib=compiler-rt"
-COMPILER_RT_remove_pn-webkitgtk_powerpc = "-rtlib=compiler-rt"
+COMPILER_RT:remove:pn-webkitgtk:powerpc = "-rtlib=compiler-rt"
-COMPILER_RT_remove_pn-m4_armeb = "-rtlib=compiler-rt"
+COMPILER_RT:remove:pn-m4:armeb = "-rtlib=compiler-rt"
-COMPILER_RT_remove_pn-ruby_armeb = "-rtlib=compiler-rt"
+COMPILER_RT:remove:pn-ruby:armeb = "-rtlib=compiler-rt"
-COMPILER_RT_remove_pn-webkitgtk_armeb = "-rtlib=compiler-rt"
+COMPILER_RT:remove:pn-webkitgtk:armeb = "-rtlib=compiler-rt"
 # build/lib/libQt5Widgets.so: undefined reference to `__lshrti3'
 # __lshrti3 is missing in libgcc
-COMPILER_RT_pn-qtbase_toolchain-clang_riscv32 = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT:pn-qtbase:toolchain-clang:riscv32 = "-rtlib=compiler-rt ${UNWINDLIB}"
-LDFLAGS_append_pn-gnutls_toolchain-clang_riscv64 = " -latomic"
+LDFLAGS:append:pn-gnutls:toolchain-clang:riscv64 = " -latomic"
-LDFLAGS_append_pn-harfbuzz_toolchain-clang_riscv64 = " -latomic"
+LDFLAGS:append:pn-harfbuzz:toolchain-clang:riscv64 = " -latomic"
-LDFLAGS_append_pn-qtwebengine_toolchain-clang_runtime-gnu_x86 = " -latomic"
+LDFLAGS:append:pn-qtwebengine:toolchain-clang_runtime-gnu:x86 = " -latomic"
-LDFLAGS_append_pn-qemu_toolchain-clang_x86 = " -latomic"
+LDFLAGS:append:pn-qemu:toolchain-clang:x86 = " -latomic"
 # glibc is built with gcc and hence encodes some libgcc specific builtins which are not found
 # when doing static linking with clang using compiler-rt, so use libgcc
 # undefined reference to `__unordtf2'
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-aufs-util:libc-glibc:toolchain-clang:x86 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:x86 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-tsocks:libc-glibc:toolchain-clang:x86 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-libc-bench:libc-glibc:toolchain-clang:x86 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-mpich_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-mpich:libc-glibc:toolchain-clang:x86 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-aufs-util:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-tsocks:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 #(unwind.o): in function `__pthread_unwind':
 #/usr/src/debug/glibc/2.29-r0/git/nptl/unwind.c:121: undefined reference to `_Unwind_ForcedUnwind'
 #clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_arm = "--unwindlib=libgcc"
+COMPILER_RT:pn-aufs-util:libc-glibc:toolchain-clang:arm = "--unwindlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_arm = "--unwindlib=libgcc"
+COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:arm = "--unwindlib=libgcc"
-COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_arm = "--unwindlib=libgcc"
+COMPILER_RT:pn-libc-bench:libc-glibc:toolchain-clang:arm = "--unwindlib=libgcc"
 # Uses gcc for native tools, e.g. nsinstall and passes clang options which fails so
 # let same compiler ( gcc or clang) be native/cross compiler
 # | gcc: error: unrecognized command line option ‘-Qunused-arguments’
-BUILD_CC_pn-nss_toolchain-clang = "clang -rtlib=libgcc -unwindlib=none"
+BUILD_CC:pn-nss:toolchain-clang = "clang -rtlib=libgcc -unwindlib=none"
 # libnoprofile.c:19:5: error: expected parameter declarator
 # int printf(const char *format, ...) {
@@ -342,16 +342,16 @@ BUILD_CC_pn-nss_toolchain-clang = "clang -rtlib=libgcc -unwindlib=none"
 # error: non-constant-expression cannot be narrowed from type 'std::chrono::duration<
 #long long, std::ratio<1, 1> >::rep' (aka 'long long') to '__time_t' (aka 'long') in initializer list
 # [-Wc++11-narrowing]
-CXXFLAGS_append_pn-apt_toolchain-clang = " -Wno-c++11-narrowing"
+CXXFLAGS:append:pn-apt:toolchain-clang = " -Wno-c++11-narrowing"
-lcl_maybe_fortify_pn-apt_toolchain-clang = ""
+lcl_maybe_fortify:pn-apt:toolchain-clang = ""
 # LTO
 # Seems to use symver ASMs see https://stackoverflow.com/questions/46304742/how-to-combine-lto-with-symbol-versioning
 # lib/puny_encode.c:136: multiple definition of `_idn2_punycode_encode'
-LTO_pn-libidn2_toolchain-clang = ""
+LTO:pn-libidn2:toolchain-clang = ""
 #libcairo.so: undefined reference to pthread_mutexattr_init [--no-allow-shlib-undefined]
-LTO_pn-cairo_toolchain-clang = ""
+LTO:pn-cairo:toolchain-clang = ""
 # see https://bugs.llvm.org/show_bug.cgi?id=50443 this is in clang-13, until it is fixed do not use -O2
-SELECTED_OPTIMIZATION_remove_pn-poke_toolchain-clang = "-O2"
+SELECTED_OPTIMIZATION:remove:pn-poke:toolchain-clang = "-O2"
diff --git a/conf/nonscanable.conf b/conf/nonscanable.conf
index e2b8f5d..3cdc454 100644
--- a/conf/nonscanable.conf
+++ b/conf/nonscanable.conf
@@ -1,22 +1,22 @@
-SCAN_BUILD_pn-linux-libc-headers = ""
+SCAN_BUILD:pn-linux-libc-headers = ""
-SCAN_BUILD_pn-update-rc.d = ""
+SCAN_BUILD:pn-update-rc.d = ""
-SCAN_BUILD_pn-initscripts = ""
+SCAN_BUILD:pn-initscripts = ""
-SCAN_BUILD_pn-base-files = ""
+SCAN_BUILD:pn-base-files = ""
-SCAN_BUILD_pn-os-release = ""
+SCAN_BUILD:pn-os-release = ""
-SCAN_BUILD_pn-wireless-regdb = ""
+SCAN_BUILD:pn-wireless-regdb = ""
-SCAN_BUILD_pn-tzdata = ""
+SCAN_BUILD:pn-tzdata = ""
-SCAN_BUILD_pn-qemuwrapper-cross = ""
+SCAN_BUILD:pn-qemuwrapper-cross = ""
-SCAN_BUILD_pn-depmodwrapper-cross = ""
+SCAN_BUILD:pn-depmodwrapper-cross = ""
-SCAN_BUILD_pn-bluez-firmware-rpidistro = ""
+SCAN_BUILD:pn-bluez-firmware-rpidistro = ""
-SCAN_BUILD_pn-udev-rules-rpi = ""
+SCAN_BUILD:pn-udev-rules-rpi = ""
-SCAN_BUILD_pn-shadow-securetty = ""
+SCAN_BUILD:pn-shadow-securetty = ""
-SCAN_BUILD_pn-96boards-tools = ""
+SCAN_BUILD:pn-96boards-tools = ""
-SCAN_BUILD_pn-run-postinsts = ""
+SCAN_BUILD:pn-run-postinsts = ""
-SCAN_BUILD_pn-keymaps = ""
+SCAN_BUILD:pn-keymaps = ""
-SCAN_BUILD_pn-sysvinit-inittab = ""
+SCAN_BUILD:pn-sysvinit-inittab = ""
-SCAN_BUILD_pn-pi-bluetooth = ""
+SCAN_BUILD:pn-pi-bluetooth = ""
-SCAN_BUILD_pn-rpi-config = ""
+SCAN_BUILD:pn-rpi-config = ""
-SCAN_BUILD_pn-bcm2835-bootfiles = ""
+SCAN_BUILD:pn-bcm2835-bootfiles = ""
-SCAN_BUILD_pn-autoconf-archive = ""
+SCAN_BUILD:pn-autoconf-archive = ""
-SCAN_BUILD_pn-compiler-rt = ""
+SCAN_BUILD:pn-compiler-rt = ""
-SCAN_BUILD_pn-libcxx = ""
+SCAN_BUILD:pn-libcxx = ""
diff --git a/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.%.bbappend b/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.%.bbappend
index dd3c5f9..543f32c 100644
--- a/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.%.bbappend
+++ b/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://fix_duplicate_pdb_search_init.patch "
+SRC_URI:append = " file://fix_duplicate_pdb_search_init.patch "
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.20.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.20.0.bb
index 325a6ee..43e828b 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.20.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.20.0.bb
@@ -13,10 +13,10 @@ DEPENDS += "bison-native \
            "
 LUAJIT ?= "luajit"
-LUAJIT_powerpc64le = ""
+LUAJIT:powerpc64le = ""
-LUAJIT_powerpc64 = ""
+LUAJIT:powerpc64 = ""
-RDEPENDS_${PN} += "bash python3 python3-core python3-setuptools xz"
+RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz"
 SRC_URI = "gitsm://github.com/iovisor/bcc \
           file://0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch \
@@ -32,7 +32,7 @@ PV .= "+git${SRCPV}"
 S = "${WORKDIR}/git"
 PACKAGECONFIG ??= "examples"
-PACKAGECONFIG_remove_libc-musl = "examples"
+PACKAGECONFIG:remove:libc-musl = "examples"
 PACKAGECONFIG[manpages] = "-DENABLE_MAN=ON,-DENABLE_MAN=OFF,"
 PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF,"
@@ -45,12 +45,12 @@ EXTRA_OECMAKE = " \
    -DPYTHON_FLAGS=--install-lib=${PYTHON_SITEPACKAGES_DIR} \
 "
-do_install_append() {
+do_install:append() {
        sed -e 's@#!/usr/bin/python@#!/usr/bin/env python3@g' \
            -i $(find ${D}${datadir}/${PN} -type f)
 }
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
-FILES_${PN}-doc += "${datadir}/${PN}/man"
+FILES:${PN}-doc += "${datadir}/${PN}/man"
 COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*)-linux"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb
index d6ab0ce..9f67d94 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb
@@ -11,7 +11,7 @@ DEPENDS += "bison-native \
            "
 PV .= "+git${SRCREV}"
-RDEPENDS_${PN} += "bash python3 xz"
+RDEPENDS:${PN} += "bash python3 xz"
 SRC_URI = "git://github.com/iovisor/bpftrace;branch=master \
           file://0001-bpforc.h-Include-optional-header.patch \
@@ -29,4 +29,4 @@ EXTRA_OECMAKE = " \
 "
 COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*)-linux"
-COMPATIBLE_HOST_libc-musl = "null"
+COMPATIBLE_HOST:libc-musl = "null"
diff --git a/dynamic-layers/openembedded-layer/recipes-kernel/kernel-selftest/kernel-selftest.bbappend b/dynamic-layers/openembedded-layer/recipes-kernel/kernel-selftest/kernel-selftest.bbappend
index a1d4585..580d98b 100644
--- a/dynamic-layers/openembedded-layer/recipes-kernel/kernel-selftest/kernel-selftest.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-kernel/kernel-selftest/kernel-selftest.bbappend
@@ -1,4 +1,4 @@
-DEPENDS_append = " clang-native"
+DEPENDS:append = " clang-native"
-DEPENDS_remove = "llvm-native"
+DEPENDS:remove = "llvm-native"
-EXCLUDE_FROM_WORLD_forcevariable = ""
+EXCLUDE_FROM_WORLD:forcevariable = ""
diff --git a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
index d5e4bcc..bc0bdd9 100644
--- a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
+++ b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
@@ -1,4 +1,4 @@
-do_configure_append_toolchain-clang() {
+do_configure:append:toolchain-clang() {
        export EFI_CC="${CC}"
        sed -i -e "s#O0#O#g" ${S}/src/boot/efi/meson.build
 }
diff --git a/recipes-connectivity/openssl/openssl_%.bbappend b/recipes-connectivity/openssl/openssl_%.bbappend
index 408ac38..9112ead 100644
--- a/recipes-connectivity/openssl/openssl_%.bbappend
+++ b/recipes-connectivity/openssl/openssl_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-LDLIBS_append_toolchain-clang_riscv64 = " -latomic"
+LDLIBS:append:toolchain-clang:riscv64 = " -latomic"
-LDLIBS_append_toolchain-clang_riscv32 = " -latomic"
+LDLIBS:append:toolchain-clang:riscv32 = " -latomic"
-do_configure_prepend_toolchain-clang () {
+do_configure:prepend:toolchain-clang () {
    export LDLIBS="${LDLIBS}"
 }
diff --git a/recipes-core/busybox/busybox_1.33%.bbappend b/recipes-core/busybox/busybox_1.33%.bbappend
index f26df7e..2c0af5e 100644
--- a/recipes-core/busybox/busybox_1.33%.bbappend
+++ b/recipes-core/busybox/busybox_1.33%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_toolchain-clang = "\
+SRC_URI:append:toolchain-clang = "\
    file://0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const.patch \
 "
 # networking/tls_pstm_sqr_comba.c:514:4: error: inline assembly requires more registers than available
 #                        SQRADD2(*tmpx++, *tmpy--);
 #                        ^
-TOOLCHAIN_x86 = "gcc"
+TOOLCHAIN:x86 = "gcc"
diff --git a/recipes-core/glib-2.0/glib-2.0_%.bbappend b/recipes-core/glib-2.0/glib-2.0_%.bbappend
index 4a0f94a..2aef80e 100644
--- a/recipes-core/glib-2.0/glib-2.0_%.bbappend
+++ b/recipes-core/glib-2.0/glib-2.0_%.bbappend
@@ -1 +1 @@
-CFLAGS_append_libc-musl = " -Wno-format-nonliteral"
+CFLAGS:append:libc-musl = " -Wno-format-nonliteral"
diff --git a/recipes-core/meta/clang-environment.inc b/recipes-core/meta/clang-environment.inc
index a238e49..7887610 100644
--- a/recipes-core/meta/clang-environment.inc
+++ b/recipes-core/meta/clang-environment.inc
@@ -1,14 +1,14 @@
 export TARGET_CLANGCC_ARCH = "${TARGET_CC_ARCH}"
-TARGET_CLANGCC_ARCH_remove = "-mthumb-interwork"
+TARGET_CLANGCC_ARCH:remove = "-mthumb-interwork"
-TARGET_CLANGCC_ARCH_remove = "-mmusl"
+TARGET_CLANGCC_ARCH:remove = "-mmusl"
-TARGET_CLANGCC_ARCH_remove = "-muclibc"
+TARGET_CLANGCC_ARCH:remove = "-muclibc"
-TARGET_CLANGCC_ARCH_remove = "-meb"
+TARGET_CLANGCC_ARCH:remove = "-meb"
-TARGET_CLANGCC_ARCH_remove = "-mel"
+TARGET_CLANGCC_ARCH:remove = "-mel"
-TARGET_CLANGCC_ARCH_append = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
+TARGET_CLANGCC_ARCH:append = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
-TARGET_CLANGCC_ARCH_remove_powerpc = "-mhard-float"
+TARGET_CLANGCC_ARCH:remove:powerpc = "-mhard-float"
-TARGET_CLANGCC_ARCH_remove_powerpc = "-mno-spe"
+TARGET_CLANGCC_ARCH:remove:powerpc = "-mno-spe"
-create_sdk_files_append() {
+create_sdk_files:append() {
        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
        if ${@bb.utils.contains('CLANGSDK', '1', 'true', 'false', d)}; then
            echo 'export CLANGCC="${TARGET_PREFIX}clang --target=${TARGET_SYS} ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
diff --git a/recipes-core/meta/meta-environment-extsdk.bbappend b/recipes-core/meta/meta-environment-extsdk.bbappend
index e867074..d40a025 100644
--- a/recipes-core/meta/meta-environment-extsdk.bbappend
+++ b/recipes-core/meta/meta-environment-extsdk.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 require clang-environment.inc
diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend
index e867074..d40a025 100644
--- a/recipes-core/meta/meta-environment.bbappend
+++ b/recipes-core/meta/meta-environment.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 require clang-environment.inc
diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend
index 70fe10c..d9e9549 100644
--- a/recipes-core/musl/musl_%.bbappend
+++ b/recipes-core/musl/musl_%.bbappend
@@ -1,4 +1,4 @@
-DEPENDS_append_toolchain-clang = " clang-cross-${TARGET_ARCH}"
+DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
-DEPENDS_remove_toolchain-clang = "virtual/${TARGET_PREFIX}gcc"
+DEPENDS:remove:toolchain-clang = "virtual/${TARGET_PREFIX}gcc"
-TOOLCHAIN_x86-x32 = "gcc"
+TOOLCHAIN:x86-x32 = "gcc"
-TOOLCHAIN_powerpc64 = "gcc"
+TOOLCHAIN:powerpc64 = "gcc"
diff --git a/recipes-core/ncurses/ncurses_%.bbappend b/recipes-core/ncurses/ncurses_%.bbappend
index 096d5bc..6e7a7c1 100644
--- a/recipes-core/ncurses/ncurses_%.bbappend
+++ b/recipes-core/ncurses/ncurses_%.bbappend
@@ -1 +1 @@
-CACHED_CONFIGUREVARS_append_toolchain-clang = " cf_cv_prog_CC_c_o=yes cf_cv_prog_CXX_c_o=yes"
+CACHED_CONFIGUREVARS:append:toolchain-clang = " cf_cv_prog_CC_c_o=yes cf_cv_prog_CXX_c_o=yes"
diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
index 0c8ae6c..b2b0a84 100644
--- a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
+++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN} += "${@bb.utils.contains('CLANGSDK', '1', 'nativesdk-clang', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('CLANGSDK', '1', 'nativesdk-clang', '', d)}"
diff --git a/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend b/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend
index 403af1a..527ff74 100644
--- a/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-RDEPENDS_packagegroup-core-buildessential_append_toolchain-clang = " clang "
+RDEPENDS:packagegroup-core-buildessential:append:toolchain-clang = " clang "
diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
index 59f0959..29990f0 100644
--- a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
@@ -1 +1 @@
-RRECOMMENDS_${PN} += "${@bb.utils.contains('CLANGSDK', '1', 'libcxx-dev libcxx-staticdev compiler-rt-dev compiler-rt-staticdev', '', d)}"
+RRECOMMENDS:${PN} += "${@bb.utils.contains('CLANGSDK', '1', 'libcxx-dev libcxx-staticdev compiler-rt-dev compiler-rt-staticdev', '', d)}"
diff --git a/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
index 5b397b5..3199a69 100644
--- a/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
+++ b/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
@@ -1,3 +1,3 @@
 CLANGCROSSCANADIAN = "clang-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 CLANGCROSSCANADIANDEPS += "${@all_multilib_tune_values(d, 'CLANGCROSSCANADIAN')}"
-RDEPENDS_${PN} += "${@bb.utils.contains('CLANGSDK', '1', '${CLANGCROSSCANADIANDEPS}', '', d)}"
+RDEPENDS:${PN} += "${@bb.utils.contains('CLANGSDK', '1', '${CLANGCROSSCANADIANDEPS}', '', d)}"
diff --git a/recipes-devtools/castxml/castxml_git.bb b/recipes-devtools/castxml/castxml_git.bb
index 4d3aa8a..f2c6b3e 100644
--- a/recipes-devtools/castxml/castxml_git.bb
+++ b/recipes-devtools/castxml/castxml_git.bb
@@ -14,15 +14,15 @@ DEPENDS = "clang"
 # Match clang's idea of what TOOLCHAIN should be.
 TOOLCHAIN = "clang"
-TOOLCHAIN_class-native = "gcc"
+TOOLCHAIN:class-native = "gcc"
-TOOLCHAIN_class-nativesdk = "clang"
+TOOLCHAIN:class-nativesdk = "clang"
-BUILD_CC_class-nativesdk = "clang"
+BUILD_CC:class-nativesdk = "clang"
-BUILD_CXX_class-nativesdk = "clang++"
+BUILD_CXX:class-nativesdk = "clang++"
-BUILD_AR_class-nativesdk = "llvm-ar"
+BUILD_AR:class-nativesdk = "llvm-ar"
-BUILD_RANLIB_class-nativesdk = "llvm-ranlib"
+BUILD_RANLIB:class-nativesdk = "llvm-ranlib"
-BUILD_NM_class-nativesdk = "llvm-nm"
+BUILD_NM:class-nativesdk = "llvm-nm"
-LDFLAGS_append_class-nativesdk = " -fuse-ld=gold"
+LDFLAGS:append:class-nativesdk = " -fuse-ld=gold"
 inherit cmake cmake-native pkgconfig python3native
diff --git a/recipes-devtools/clang/clang-cross-canadian_git.bb b/recipes-devtools/clang/clang-cross-canadian_git.bb
index b16dbe1..2e00bd9 100644
--- a/recipes-devtools/clang/clang-cross-canadian_git.bb
+++ b/recipes-devtools/clang/clang-cross-canadian_git.bb
@@ -27,6 +27,6 @@ do_install() {
 }
 SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \
                      *-llvm-ranlib *-llvm-nm *-lld *-ld.lld"
-do_install_append() {
+do_install:append() {
        cross_canadian_bindirlinks
 }
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index e52005b..6642af6 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -10,11 +10,11 @@ require common-source.inc
 INHIBIT_DEFAULT_DEPS = "1"
-BUILD_CC_class-nativesdk = "clang"
+BUILD_CC:class-nativesdk = "clang"
-BUILD_CXX_class-nativesdk = "clang++"
+BUILD_CXX:class-nativesdk = "clang++"
-BUILD_AR_class-nativesdk = "llvm-ar"
+BUILD_AR:class-nativesdk = "llvm-ar"
-BUILD_RANLIB_class-nativesdk = "llvm-ranlib"
+BUILD_RANLIB:class-nativesdk = "llvm-ranlib"
-BUILD_NM_class-nativesdk = "llvm-nm"
+BUILD_NM:class-nativesdk = "llvm-nm"
 inherit cmake cmake-native pkgconfig python3native
@@ -55,8 +55,8 @@ PACKAGECONFIG ??= "compiler-rt libcplusplus shared-libs lldb-wchar \
                   ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)} \
                   rtti eh libedit terminfo \
                   "
-PACKAGECONFIG_class-native = "rtti eh libedit shared-libs ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}"
+PACKAGECONFIG:class-native = "rtti eh libedit shared-libs ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}"
-PACKAGECONFIG_class-nativesdk = "rtti eh libedit shared-libs ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto lto', d)} ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}"
+PACKAGECONFIG:class-nativesdk = "rtti eh libedit shared-libs ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto lto', d)} ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}"
 PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,"
 PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,"
@@ -101,7 +101,7 @@ CLANG_DEFAULT_OPENMP_RUNTIME;\
 LLVM_TARGETS_TO_BUILD ?= "AMDGPU;AArch64;ARM;BPF;Mips;PowerPC;RISCV;X86"
 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= ""
-LLVM_EXPERIMENTAL_TARGETS_TO_BUILD_append = ";${@get_clang_experimental_target_arch(bb, d)}"
+LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:append = ";${@get_clang_experimental_target_arch(bb, d)}"
 HF = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}"
 HF[vardepvalue] = "${HF}"
@@ -109,10 +109,10 @@ HF[vardepvalue] = "${HF}"
 LLVM_PROJECTS ?= "clang;clang-tools-extra;lld${LLDB}"
 LLDB ?= ";lldb"
 # LLDB support for RISCV/Mips32 does not work yet
-LLDB_riscv32 = ""
+LLDB:riscv32 = ""
-LLDB_riscv64 = ""
+LLDB:riscv64 = ""
-LLDB_mips = ""
+LLDB:mips = ""
-LLDB_mipsel = ""
+LLDB:mipsel = ""
 #CMAKE_VERBOSE = "VERBOSE=1"
@@ -136,10 +136,10 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                  -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
 "
-EXTRA_OECMAKE_append_class-native = "\
+EXTRA_OECMAKE:append:class-native = "\
                  -DPYTHON_EXECUTABLE='${PYTHON}' \
 "
-EXTRA_OECMAKE_append_class-nativesdk = "\
+EXTRA_OECMAKE:append:class-nativesdk = "\
                  -DCMAKE_CROSSCOMPILING:BOOL=ON \
                  -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \
                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
@@ -154,7 +154,7 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
                  -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
                  -DPYTHON_EXECUTABLE='${PYTHON}' \
 "
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
                  -DCMAKE_CROSSCOMPILING:BOOL=ON \
                  -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR}' \
                  -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
@@ -175,17 +175,17 @@ EXTRA_OECMAKE_append_class-target = "\
 "
 DEPENDS = "binutils zlib libffi libxml2 libxml2-native ninja-native swig-native"
-DEPENDS_append_class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk nativesdk-python3"
+DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk nativesdk-python3"
-DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} python3"
+DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} python3"
-RRECOMMENDS_${PN} = "binutils"
+RRECOMMENDS:${PN} = "binutils"
-RRECOMMENDS_${PN}_append_class-target = " libcxx-dev"
+RRECOMMENDS:${PN}:append:class-target = " libcxx-dev"
-do_install_append() {
+do_install:append() {
    rm -rf ${D}${libdir}/python*/site-packages/six.py
 }
-do_install_append_class-target () {
+do_install:append:class-target () {
    # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH
    sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake
@@ -208,7 +208,7 @@ endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake
    done
 }
-do_install_append_class-native () {
+do_install:append:class-native () {
    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
    for f in `find ${D}${bindir} -executable -type f -not -type l`; do
@@ -220,7 +220,7 @@ do_install_append_class-native () {
    ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
 }
-do_install_append_class-nativesdk () {
+do_install:append:class-nativesdk () {
    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
    for f in `find ${D}${bindir} -executable -type f -not -type l`; do
@@ -236,15 +236,15 @@ do_install_append_class-nativesdk () {
 PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python libclang lldb lldb-server liblldb"
 PROVIDES += "llvm llvm${PV}"
-PROVIDES_append_class-native = " llvm-native"
+PROVIDES:append:class-native = " llvm-native"
 BBCLASSEXTEND = "native nativesdk"
-RDEPENDS_lldb += "${PN}-lldb-python"
+RDEPENDS:lldb += "${PN}-lldb-python"
-FILES_${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*"
+FILES:${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*"
-FILES_${PN} += "\
+FILES:${PN} += "\
  ${libdir}/BugpointPasses.so \
  ${libdir}/LLVMHello.so \
  ${libdir}/LLVMgold.so \
@@ -256,59 +256,59 @@ FILES_${PN} += "\
  ${datadir}/opt-viewer/ \
 "
-FILES_lldb = "\
+FILES:lldb = "\
  ${bindir}/lldb \
 "
-FILES_lldb-server = "\
+FILES:lldb-server = "\
  ${bindir}/lldb-server \
 "
-FILES_liblldb = "\
+FILES:liblldb = "\
  ${libdir}/liblldbIntelFeatures.so* \
  ${libdir}/liblldb.so* \
 "
-FILES_${PN}-libllvm =+ "\
+FILES:${PN}-libllvm =+ "\
  ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}.so \
  ${libdir}/libLLVM-${MAJOR_VER}.so \
  ${libdir}/libLLVM-${MAJOR_VER}git.so \
  ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}git.so \
 "
-FILES_libclang = "\
+FILES:libclang = "\
  ${libdir}/libclang.so.${MAJOR_VER} \
 "
-FILES_${PN}-dev += "\
+FILES:${PN}-dev += "\
  ${datadir}/llvm/cmake \
  ${libdir}/cmake \
  ${nonarch_libdir}/libear \
  ${nonarch_libdir}/${BPN}/*.la \
 "
-FILES_${PN}-staticdev += "${nonarch_libdir}/${BPN}/*.a"
+FILES:${PN}-staticdev += "${nonarch_libdir}/${BPN}/*.a"
-FILES_${PN}-staticdev_remove = "${libdir}/${BPN}/*.a"
+FILES:${PN}-staticdev:remove = "${libdir}/${BPN}/*.a"
-FILES_${PN}-dev_remove = "${libdir}/${BPN}/*.la"
+FILES:${PN}-dev:remove = "${libdir}/${BPN}/*.la"
-FILES_${PN}_remove = "${libdir}/${BPN}/*"
+FILES:${PN}:remove = "${libdir}/${BPN}/*"
-INSANE_SKIP_${PN} += "already-stripped"
+INSANE_SKIP:${PN} += "already-stripped"
 #INSANE_SKIP_${PN}-dev += "dev-elf"
-INSANE_SKIP_${PN}-lldb-python += "dev-so dev-deps"
+INSANE_SKIP:${PN}-lldb-python += "dev-so dev-deps"
-INSANE_SKIP_liblldb = "dev-so"
+INSANE_SKIP:liblldb = "dev-so"
 #Avoid SSTATE_SCAN_COMMAND running sed over llvm-config.
-SSTATE_SCAN_FILES_remove = "*-config"
+SSTATE_SCAN_FILES:remove = "*-config"
 TOOLCHAIN = "clang"
-TOOLCHAIN_class-native = "gcc"
+TOOLCHAIN:class-native = "gcc"
-TOOLCHAIN_class-nativesdk = "clang"
+TOOLCHAIN:class-nativesdk = "clang"
-SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}"
+SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
-SYSROOT_PREPROCESS_FUNCS_append_class-target = " clang_sysroot_preprocess"
+SYSROOT_PREPROCESS_FUNCS:append:class-target = " clang_sysroot_preprocess"
 clang_sysroot_preprocess() {
        install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
index 38558d7..42005df 100644
--- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
+++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
@@ -13,11 +13,11 @@ inherit cmake pkgconfig python3native
 LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee54e877a"
-TUNE_CCARGS_remove = "-no-integrated-as"
+TUNE_CCARGS:remove = "-no-integrated-as"
 DEPENDS += "ninja-native virtual/crypt"
-DEPENDS_append_class-native = " clang-native libxcrypt-native"
+DEPENDS:append:class-native = " clang-native libxcrypt-native"
-DEPENDS_append_class-nativesdk = " clang-native nativesdk-libxcrypt"
+DEPENDS:append:class-nativesdk = " clang-native nativesdk-libxcrypt"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF"
@@ -45,15 +45,15 @@ EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=OFF \
                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
 "
-EXTRA_OECMAKE_append_class-nativesdk = "\
+EXTRA_OECMAKE:append:class-nativesdk = "\
               -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
               -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
 "
-EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
+EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
-EXTRA_OECMAKE_append_powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
+EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
-do_install_append () {
+do_install:append () {
    if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
        mkdir -p ${D}${nonarch_libdir}
        mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang
@@ -64,17 +64,17 @@ do_install_append () {
 }
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \
+FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \
                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \
                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt"
-FILES_${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a"
+FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a"
-FILES_${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \
+FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \
                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \
                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \
                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a \
                   "
-INSANE_SKIP_${PN} = "dev-so libdir"
+INSANE_SKIP:${PN} = "dev-so libdir"
-INSANE_SKIP_${PN}-dbg = "libdir"
+INSANE_SKIP:${PN}-dbg = "libdir"
 #PROVIDES_append_class-target = "\
 #        virtual/${TARGET_PREFIX}compilerlibs \
@@ -85,18 +85,18 @@ INSANE_SKIP_${PN}-dbg = "libdir"
 #        "
 #
-RDEPENDS_${PN}-dev += "${PN}-staticdev"
+RDEPENDS:${PN}-dev += "${PN}-staticdev"
 BBCLASSEXTEND = "native nativesdk"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY_${PN}-dev = "1"
+ALLOW_EMPTY:${PN}-dev = "1"
-TOOLCHAIN_forcevariable = "clang"
+TOOLCHAIN:forcevariable = "clang"
-SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}"
+SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
 # riscv and x86_64 Sanitizers work on musl too
-COMPATIBLE_HOST_libc-musl_x86-64 = "(.*)"
+COMPATIBLE_HOST:libc-musl:x86-64 = "(.*)"
-COMPATIBLE_HOST_libc-musl_riscv64 = "(.*)"
+COMPATIBLE_HOST:libc-musl:riscv64 = "(.*)"
-COMPATIBLE_HOST_libc-musl_riscv32 = "(.*)"
+COMPATIBLE_HOST:libc-musl:riscv32 = "(.*)"
-COMPATIBLE_HOST_libc-musl = "null"
+COMPATIBLE_HOST:libc-musl = "null"
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 8a595d1..607bbc9 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -16,29 +16,29 @@ LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee
 LIBCPLUSPLUS = ""
 COMPILER_RT = ""
-TUNE_CCARGS_remove = "-no-integrated-as"
+TUNE_CCARGS:remove = "-no-integrated-as"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "ninja-native libgcc"
-DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
+DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
-DEPENDS_append_class-nativesdk = " clang-native"
+DEPENDS:append:class-nativesdk = " clang-native"
-DEPENDS_append_class-native = " clang-native"
+DEPENDS:append:class-native = " clang-native"
 CXXFLAGS += "-stdlib=libstdc++"
 LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++"
 BUILD_CXXFLAGS += "-stdlib=libstdc++"
 BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++"
-BUILD_CPPFLAGS_remove = "-stdlib=libc++"
+BUILD_CPPFLAGS:remove = "-stdlib=libc++"
-BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi"
+BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi"
-BUILD_CC_toolchain-clang  = "${CCACHE}clang"
+BUILD_CC:toolchain-clang  = "${CCACHE}clang"
-BUILD_CXX_toolchain-clang = "${CCACHE}clang++"
+BUILD_CXX:toolchain-clang = "${CCACHE}clang++"
-BUILD_CPP_toolchain-clang = "${CCACHE}clang -E"
+BUILD_CPP:toolchain-clang = "${CCACHE}clang -E"
-BUILD_CCLD_toolchain-clang = "${CCACHE}clang"
+BUILD_CCLD:toolchain-clang = "${CCACHE}clang"
-BUILD_RANLIB_toolchain-clang = "llvm-ranlib"
+BUILD_RANLIB:toolchain-clang = "llvm-ranlib"
-BUILD_AR_toolchain-clang = "llvm-ar"
+BUILD_AR:toolchain-clang = "llvm-ar"
-BUILD_NM_toolchain-clang = "llvm-nm"
+BUILD_NM:toolchain-clang = "llvm-nm"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF"
@@ -59,22 +59,22 @@ EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=OFF \
                  -DLLVM_ENABLE_PROJECTS='compiler-rt' \
                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
 "
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
               -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
               -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
               -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
 "
-EXTRA_OECMAKE_append_class-nativesdk = "\
+EXTRA_OECMAKE:append:class-nativesdk = "\
               -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
               -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
               -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
               -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
               -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
 "
-EXTRA_OECMAKE_append_powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
+EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
-do_install_append () {
+do_install:append () {
    if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
        mkdir -p ${D}${nonarch_libdir}
        mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang
@@ -83,17 +83,17 @@ do_install_append () {
 }
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \
+FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \
                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \
                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt"
-FILES_${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a"
+FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a"
-FILES_${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \
+FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \
                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \
                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \
                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a \
                   "
-INSANE_SKIP_${PN} = "dev-so libdir"
+INSANE_SKIP:${PN} = "dev-so libdir"
-INSANE_SKIP_${PN}-dbg = "libdir"
+INSANE_SKIP:${PN}-dbg = "libdir"
 #PROVIDES_append_class-target = "\
 #        virtual/${TARGET_PREFIX}compilerlibs \
@@ -104,12 +104,12 @@ INSANE_SKIP_${PN}-dbg = "libdir"
 #        "
 #
-RDEPENDS_${PN}-dev += "${PN}-staticdev"
+RDEPENDS:${PN}-dev += "${PN}-staticdev"
 BBCLASSEXTEND = "native nativesdk"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY_${PN}-dev = "1"
+ALLOW_EMPTY:${PN}-dev = "1"
-TOOLCHAIN_forcevariable = "clang"
+TOOLCHAIN:forcevariable = "clang"
-SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}"
+SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
diff --git a/recipes-devtools/clang/libclc_git.bb b/recipes-devtools/clang/libclc_git.bb
index 9525b25..3cc52b5 100644
--- a/recipes-devtools/clang/libclc_git.bb
+++ b/recipes-devtools/clang/libclc_git.bb
@@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \
                                -Dll_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeLLAsmCompiler.cmake.in \
                        "
-do_configure_prepend () {
+do_configure:prepend () {
        # Write out a qemu wrapper that will be used by cmake
        # so that it can run target helper binaries through that.
        qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
@@ -32,6 +32,6 @@ EOF
        chmod +x ${WORKDIR}/qemuwrapper
 }
-FILES_${PN} += "${datadir}/clc"
+FILES:${PN} += "${datadir}/clc"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index b143f8c..9ee3d34 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -11,8 +11,8 @@ require common-source.inc
 inherit cmake cmake-native python3native
 PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("RUNTIME", "llvm", "unwind unwind-shared", "", d)}"
-PACKAGECONFIG_append_armv5 = " no-atomics"
+PACKAGECONFIG:append:armv5 = " no-atomics"
-PACKAGECONFIG_remove_class-native = "compiler-rt"
+PACKAGECONFIG:remove:class-native = "compiler-rt"
 PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,,"
 PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions',"
 PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED_LINKER_FLAGS='-latomic',,"
@@ -20,20 +20,20 @@ PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPIL
 PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,,"
 DEPENDS += "ninja-native"
-DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs"
+DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs"
-DEPENDS_append_class-native = " clang-native"
+DEPENDS:append:class-native = " clang-native"
 LIBCPLUSPLUS = ""
 COMPILER_RT ?= "-rtlib=compiler-rt"
-CC_append_toolchain-clang_class-native = " -unwindlib=libgcc -rtlib=libgcc"
+CC:append:toolchain-clang:class-native = " -unwindlib=libgcc -rtlib=libgcc"
 CXXFLAGS += "-stdlib=libstdc++"
 LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++"
 BUILD_CXXFLAGS += "-stdlib=libstdc++"
 BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++"
-BUILD_CPPFLAGS_remove = "-stdlib=libc++"
+BUILD_CPPFLAGS:remove = "-stdlib=libc++"
-BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi"
+BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi"
 INHIBIT_DEFAULT_DEPS = "1"
@@ -42,7 +42,7 @@ LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da39
                    file://libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
 "
-LLVM_LIBDIR_SUFFIX_powerpc64 = "64"
+LLVM_LIBDIR_SUFFIX:powerpc64 = "64"
 OECMAKE_TARGET_COMPILE = "cxxabi cxx"
 OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi ${@bb.utils.contains("RUNTIME", "llvm", "install-unwind", "", d)}"
@@ -63,31 +63,31 @@ EXTRA_OECMAKE += "\
                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
 "
-EXTRA_OECMAKE_append_class-target = " \
+EXTRA_OECMAKE:append:class-target = " \
                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \
                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
                  -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \
 "
-EXTRA_OECMAKE_append_class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \
+EXTRA_OECMAKE:append:class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \
 "
-EXTRA_OECMAKE_append_class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \
+EXTRA_OECMAKE:append:class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \
                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \
                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
                  -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \
 "
-EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
+EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
-CXXFLAGS_append_armv5 = " -mfpu=vfp2"
+CXXFLAGS:append:armv5 = " -mfpu=vfp2"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-PROVIDES_append_runtime-llvm = " libunwind"
+PROVIDES:append_runtime-llvm = " libunwind"
-do_install_append() {
+do_install:append() {
    if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)}
    then
        install -Dm 0644 ${S}/libunwind/include/libunwind.h ${S}/libunwind/include/__libunwind_config.h ${D}${includedir}
@@ -97,8 +97,8 @@ do_install_append() {
    fi
 }
-PACKAGES_append_runtime-llvm = " libunwind"
+PACKAGES:append_runtime-llvm = " libunwind"
-FILES_libunwind_runtime-llvm = "${libdir}/libunwind.so.*"
+FILES:libunwind_runtime-llvm = "${libdir}/libunwind.so.*"
 BBCLASSEXTEND = "native nativesdk"
-TOOLCHAIN_forcevariable = "clang"
+TOOLCHAIN:forcevariable = "clang"
diff --git a/recipes-devtools/clang/nativesdk-clang-glue.bb b/recipes-devtools/clang/nativesdk-clang-glue.bb
index 169366a..f1f34d5 100644
--- a/recipes-devtools/clang/nativesdk-clang-glue.bb
+++ b/recipes-devtools/clang/nativesdk-clang-glue.bb
@@ -23,8 +23,8 @@ sysroot_stage_all () {
        sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
 }
-FILES_${PN} += "${prefix_nativesdk} ${base_libdir_nativesdk}"
+FILES:${PN} += "${prefix_nativesdk} ${base_libdir_nativesdk}"
-FILES_${PN}-dbg = ""
+FILES:${PN}-dbg = ""
 deltask do_configure
 deltask do_compile
diff --git a/recipes-devtools/clang/openmp_git.bb b/recipes-devtools/clang/openmp_git.bb
index 95b3a9e..7ce89eb 100644
--- a/recipes-devtools/clang/openmp_git.bb
+++ b/recipes-devtools/clang/openmp_git.bb
@@ -27,9 +27,9 @@ OECMAKE_SOURCEPATH = "${S}/openmp"
 PACKAGECONFIG ?= "ompt-tools offloading-plugin"
-PACKAGECONFIG_remove_arm = "ompt-tools offloading-plugin"
+PACKAGECONFIG:remove:arm = "ompt-tools offloading-plugin"
-PACKAGECONFIG_remove_mipsarch = "ompt-tools offloading-plugin"
+PACKAGECONFIG:remove:mipsarch = "ompt-tools offloading-plugin"
-PACKAGECONFIG_remove_powerpc = "ompt-tools offloading-plugin"
+PACKAGECONFIG:remove:powerpc = "ompt-tools offloading-plugin"
 PACKAGECONFIG[ompt-tools] = "-DOPENMP_ENABLE_OMPT_TOOLS=ON,-DOPENMP_ENABLE_OMPT_TOOLS=OFF,"
 PACKAGECONFIG[aliases] = "-DLIBOMP_INSTALL_ALIASES=ON,-DLIBOMP_INSTALL_ALIASES=OFF,"
@@ -37,11 +37,11 @@ PACKAGECONFIG[offloading-plugin] = ",,elfutils libffi,libelf libffi"
 PACKAGES += "${PN}-libomptarget-amdgcn"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
+FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}"
-FILES_${PN}-libomptarget-amdgcn = "${libdir}/libomptarget-amdgcn-*.bc"
+FILES:${PN}-libomptarget-amdgcn = "${libdir}/libomptarget-amdgcn-*.bc"
-INSANE_SKIP_${PN} = "dev-so"
+INSANE_SKIP:${PN} = "dev-so"
-COMPATIBLE_HOST_mips64 = "null"
+COMPATIBLE_HOST:mips64 = "null"
-COMPATIBLE_HOST_riscv32 = "null"
+COMPATIBLE_HOST:riscv32 = "null"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/gdb/gdb_%.bbappend b/recipes-devtools/gdb/gdb_%.bbappend
index 63fbf48..ee1991b 100644
--- a/recipes-devtools/gdb/gdb_%.bbappend
+++ b/recipes-devtools/gdb/gdb_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_toolchain-clang_riscv64 = " file://0001-gdb-Link-with-latomic-for-riscv-clang-alone.patch "
+SRC_URI:append:toolchain-clang:riscv64 = " file://0001-gdb-Link-with-latomic-for-riscv-clang-alone.patch "
diff --git a/recipes-devtools/rpm/rpm_%.bbappend b/recipes-devtools/rpm/rpm_%.bbappend
index 732af3f..26c9e99 100644
--- a/recipes-devtools/rpm/rpm_%.bbappend
+++ b/recipes-devtools/rpm/rpm_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-DEPENDS_append_toolchain-clang = " openmp"
+DEPENDS:append:toolchain-clang = " openmp"
-DEPENDS_remove_toolchain-clang_riscv32 = "openmp"
+DEPENDS:remove:toolchain-clang:riscv32 = "openmp"
-DEPENDS_remove_toolchain-clang_mipsarch = "openmp"
+DEPENDS:remove:toolchain-clang:mipsarch = "openmp"
 # rpm needs OMP
-TOOLCHAIN_riscv32 = "gcc"
+TOOLCHAIN:riscv32 = "gcc"
-TOOLCHAIN_mipsarch = "gcc"
+TOOLCHAIN:mipsarch = "gcc"
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
index d35dc8f..1e18793 100644
--- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
+++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
@@ -29,11 +29,11 @@ EXTRA_OECMAKE = "\
        -DCCACHE_ALLOWED=FALSE \
 "
-do_compile_append() {
+do_compile:append() {
    oe_runmake llvm-spirv
 }
-do_install_append() {
+do_install:append() {
    install -Dm755 ${B}/tools/llvm-spirv/llvm-spirv ${D}${bindir}/llvm-spirv
 }
diff --git a/recipes-extended/ghostscript/ghostscript_%.bbappend b/recipes-extended/ghostscript/ghostscript_%.bbappend
index fe22e34..c1496d0 100644
--- a/recipes-extended/ghostscript/ghostscript_%.bbappend
+++ b/recipes-extended/ghostscript/ghostscript_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-do_configure_prepend_toolchain-clang () {
+do_configure:prepend:toolchain-clang () {
    if ${@bb.utils.contains('RUNTIME', 'llvm', 'true', 'false', d)}; then
        sed -i -e "s|-stdlib=libstdc++|-stdlib=libc++|g" ${S}/configure.ac
    fi
diff --git a/recipes-extended/mdadm/mdadm_%.bbappend b/recipes-extended/mdadm/mdadm_%.bbappend
index 903836e..2bdf6ca 100644
--- a/recipes-extended/mdadm/mdadm_%.bbappend
+++ b/recipes-extended/mdadm/mdadm_%.bbappend
@@ -3,4 +3,4 @@
 # |                                  &dev->size_low, &dev->size_high);
 # |                                                   ^~~~~~~~~~~~~~
-CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"
+CFLAGS:append:toolchain-clang = " -Wno-error=address-of-packed-member"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index d382f40..492d25e 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_toolchain-clang = " file://clang13.patch "
+SRC_URI:append:toolchain-clang = " file://clang13.patch "
-LDFLAGS_append_toolchain-clang = " -latomic -lm"
+LDFLAGS:append:toolchain-clang = " -latomic -lm"
-DEPENDS_append_toolchain-clang = " libatomic-ops"
+DEPENDS:append:toolchain-clang = " libatomic-ops"
-EXTRA_OEMASON_append_toolchain-clang_x86 = " -Dasm=false"
+EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false"
-EXTRA_OEMASON_append_toolchain-clang_x86-64 = " -Dasm=false"
+EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false"
 export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
diff --git a/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend b/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
index 2077fda..7854eb1 100644
--- a/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
+++ b/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_toolchain-clang_mips64 = " file://clang_mips64.patch"
+SRC_URI:append:toolchain-clang:mips64 = " file://clang_mips64.patch"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend
index dee9619..c6acc2c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_toolchain-clang_mips64 = " file://0001-Disable-fpu-using-code-when-using-clang-mips64-combo.patch"
+SRC_URI:append:toolchain-clang:mips64 = " file://0001-Disable-fpu-using-code-when-using-clang-mips64-combo.patch"
diff --git a/recipes-multimedia/libvorbis/libvorbis_%.bbappend b/recipes-multimedia/libvorbis/libvorbis_%.bbappend
index c6fe98c..bfc832f 100644
--- a/recipes-multimedia/libvorbis/libvorbis_%.bbappend
+++ b/recipes-multimedia/libvorbis/libvorbis_%.bbappend
@@ -1,4 +1,4 @@
 # | clang-7: error: unknown argument: '-mfused-madd'
-do_configure_prepend_toolchain-clang() {
+do_configure:prepend:toolchain-clang() {
        sed -i -e "s/-mfused-madd//g" ${S}/configure.ac
 }
diff --git a/recipes-support/libunwind/libunwind_%.bbappend b/recipes-support/libunwind/libunwind_%.bbappend
index 6c9057c..7dee3e8 100644
--- a/recipes-support/libunwind/libunwind_%.bbappend
+++ b/recipes-support/libunwind/libunwind_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_HOST_runtime-llvm = "null"