meta: convert to new override syntax

* Ran convert-overrides.py to generate the initial changes * Manual cleanup afterwards (which was a lot, due to our extensive use of overrides). Signed-off-by: Matt Madison <matt@madison.systems>
2025-10-29 11:32:30 +00:00 · 2021-08-03 08:14:15 -07:00
parent c9e1de40c6
commit b9507ceb23
197 changed files with 1024 additions and 1024 deletions
--- a/classes/container-runtime-csv.bbclass
+++ b/classes/container-runtime-csv.bbclass
@@ -62,9 +62,9 @@ python populate_container_csv() {
 }

 CONTAINERCSVFUNC = ""
-CONTAINERCSVFUNC_tegra = "populate_container_csv"
+CONTAINERCSVFUNC:tegra = "populate_container_csv"
 do_install[postfuncs] += "${CONTAINERCSVFUNC}"

-PACKAGES_prepend_tegra = " ${CONTAINER_CSV_PKGNAME} "
-FILES_${CONTAINER_CSV_PKGNAME} = "${sysconfdir}/nvidia-container-runtime"
-RDEPENDS_${PN}_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}"
+PACKAGES::prepend:tegra = " ${CONTAINER_CSV_PKGNAME} "
+FILES:${CONTAINER_CSV_PKGNAME} = "${sysconfdir}/nvidia-container-runtime"
+RDEPENDS:${PN}:append:tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}"
--- a/classes/cuda.bbclass
+++ b/classes/cuda.bbclass
@@ -10,8 +10,8 @@ CUDA_LDFLAGS = "\
  -Wl,-rpath,/usr/local/cuda-${CUDA_VERSION}/${baselib} \
 "

-LDFLAGS_prepend_cuda = "${TOOLCHAIN_OPTIONS} "
-LDFLAGS_append_cuda = " ${CUDA_LDFLAGS}"
+LDFLAGS:prepend:cuda = "${TOOLCHAIN_OPTIONS} "
+LDFLAGS:append:cuda = " ${CUDA_LDFLAGS}"

 def cuda_extract_compiler(compiler, d, prefix='-Xcompiler '):
    args = d.getVar(compiler).split()
@@ -49,7 +49,7 @@ CUDA_EXTRA_OECMAKE = '\
  -DCUDA_TOOLKIT_ROOT_DIR=${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION} \
  -DCUDA_NVCC_FLAGS="${CUDA_NVCC_FLAGS}" \
 '
-EXTRA_OECMAKE_append_cuda = " ${CUDA_EXTRA_OECMAKE}"
+EXTRA_OECMAKE:append:cuda = " ${CUDA_EXTRA_OECMAKE}"

 export CUDA_TOOLKIT_ROOT = "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}"
 export CUDA_NVCC_EXECUTABLE = "${CUDA_TOOLKIT_ROOT}/bin/nvcc"
@@ -57,15 +57,15 @@ export CUDACXX = "${CCACHE}${CUDA_TOOLKIT_ROOT}/bin/nvcc"
 export CUDA_PATH = "${STAGING_DIR_HOST}/usr/local/cuda-${CUDA_VERSION}"

 CUDA_NATIVEDEPS = "cuda-compiler-native cuda-cudart-native"
-CUDA_NATIVEDEPS_class-native = ""
+CUDA_NATIVEDEPS:class-native = ""
 CUDA_DEPENDS = "cuda-libraries ${CUDA_NATIVEDEPS}"

-DEPENDS_append_cuda = " ${CUDA_DEPENDS} ${@'tegra-cmake-overrides' if bb.data.inherits_class('cmake', d) else ''}"
-PATH_prepend_cuda = "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}/bin:"
+DEPENDS:append:cuda = " ${CUDA_DEPENDS} ${@'tegra-cmake-overrides' if bb.data.inherits_class('cmake', d) else ''}"
+PATH:prepend:cuda = "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}/bin:"

 # The following are for the new-style (CMake 3.8+) CUDA language
 # support and to hook in our override of FindCUDA.cmake.
-cmake_do_generate_toolchain_file_append_cuda() {
+cmake_do_generate_toolchain_file:append:cuda() {
    cat >> ${WORKDIR}/toolchain.cmake <<EOF
 set(CMAKE_CUDA_TOOLKIT_ROOT_DIR "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}" CACHE PATH "" FORCE)
 set(CMAKE_CUDA_TOOLKIT_TARGET_DIR "${STAGING_DIR_HOST}/usr/local/cuda-${CUDA_VERSION}" CACHE PATH "" FORCE)
@@ -81,10 +81,10 @@ meson_cuda_cross_config() {
 cuda = 'nvcc'
 EOF
 }
-MESON_CROSS_FILE_append_cuda_class-target = " --cross-file ${WORKDIR}/meson-cuda.cross"
+MESON_CROSS_FILE:append:cuda:class-target = " --cross-file ${WORKDIR}/meson-cuda.cross"

-PACKAGE_ARCH_cuda = "${SOC_FAMILY_PKGARCH}"
-RDEPENDS_${PN}_append_tegra = " tegra-libraries"
+PACKAGE_ARCH:cuda = "${SOC_FAMILY_PKGARCH}"
+RDEPENDS:${PN}:append:tegra = " tegra-libraries"

 python() {
    if bb.data.inherits_class('meson', d) and 'cuda' in d.getVar('OVERRIDES').split(':') and d.getVar('CLASSOVERRIDE') == 'class-target':
--- a/classes/image_types_cboot.bbclass
+++ b/classes/image_types_cboot.bbclass
@@ -13,10 +13,10 @@ oe_cbootimg_common() {
        --output "$outfile"
    [ -n "$2" ] || ln -sf $1.cboot ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.cboot
 }
-oe_cbootimg_tegra186() {
+oe_cbootimg:tegra186() {
    oe_cbootimg_common "$@"
 }
-oe_cbootimg_tegra194() {
+oe_cbootimg:tegra194() {
    oe_cbootimg_common "$@"
 }

--- a/classes/image_types_tegra.bbclass
+++ b/classes/image_types_tegra.bbclass
@@ -59,15 +59,15 @@ TEGRA_SPIFLASH_BOOT ??= ""
 TEGRA_ROOTFS_AND_KERNEL_ON_SDCARD ??=""

 CBOOTFILENAME = "cboot.bin"
-CBOOTFILENAME_tegra194 = "cboot_t194.bin"
+CBOOTFILENAME:tegra194 = "cboot_t194.bin"
 TOSIMGFILENAME = "tos-trusty.img"
-TOSIMGFILENAME_tegra194 = "tos-trusty_t194.img"
-TOSIMGFILENAME_tegra210 = "tos-mon-only.img"
+TOSIMGFILENAME:tegra194 = "tos-trusty_t194.img"
+TOSIMGFILENAME:tegra210 = "tos-mon-only.img"
 BMPBLOBFILENAME = "bmp.blob"

 BUP_PAYLOAD_DIR = "payloads_t${@d.getVar('NVIDIA_CHIP')[2:]}x"
 FLASHTOOLS_DIR = "${SOC_FAMILY}-flash"
-FLASHTOOLS_DIR_tegra194 = "tegra186-flash"
+FLASHTOOLS_DIR:tegra194 = "tegra186-flash"

 TEGRAFLASH_PACKAGE_FORMAT ??= "tar"
 TEGRAFLASH_PACKAGE_FORMATS = "tar zip"
@@ -92,7 +92,7 @@ tegraflash_post_sign_pkg() {
    :
 }

-tegraflash_post_sign_pkg_tegra210() {
+tegraflash_post_sign_pkg:tegra210() {
    mksparse -b ${TEGRA_BLBLOCKSIZE} --fillpattern=0 "${IMAGE_TEGRAFLASH_ROOTFS}" ${IMAGE_BASENAME}.img
    [ "${TEGRA_SPIFLASH_BOOT}" = "1" ] || rm -f ./${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
    sed -i -e"s,APPFILE,${IMAGE_BASENAME}.img," flash.xml
@@ -102,14 +102,14 @@ tegraflash_post_sign_pkg_tegra210() {
    fi
 }

-tegraflash_post_sign_pkg_tegra186() {
+tegraflash_post_sign_pkg:tegra186() {
    sed -i -e"s,APPFILE,${IMAGE_BASENAME}.img," secureflash.xml
    if [ -n "${IMAGE_TEGRAFLASH_DATA}" -a -n "${DATAFILE}" ]; then
        sed -i -e"s,DATAFILE,${DATAFILE}.img," secureflash.xml
    fi
 }

-tegraflash_post_sign_pkg_tegra194() {
+tegraflash_post_sign_pkg:tegra194() {
    mksparse -b ${TEGRA_BLBLOCKSIZE} --fillpattern=0 "${IMAGE_TEGRAFLASH_ROOTFS}" ${IMAGE_BASENAME}.img
    [ "${TEGRA_SPIFLASH_BOOT}" = "1" -o "${TEGRA_ROOTFS_AND_KERNEL_ON_SDCARD}" = "1" ] || rm -f ./${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}
    sed -i -e"s,APPFILE,${IMAGE_BASENAME}.img," secureflash.xml
@@ -172,7 +172,7 @@ tegraflash_create_flash_config() {
    :
 }

-tegraflash_create_flash_config_tegra210() {
+tegraflash_create_flash_config:tegra210() {
    local destdir="$1"
    local lnxfile="$2"

@@ -201,7 +201,7 @@ tegraflash_create_flash_config_tegra210() {
        > $destdir/flash.xml.in
 }

-tegraflash_create_flash_config_tegra186() {
+tegraflash_create_flash_config:tegra186() {
    local destdir="$1"
    local lnxfile="$2"

@@ -237,7 +237,7 @@ tegraflash_create_flash_config_tegra186() {
        > $destdir/flash.xml.in
 }

-tegraflash_create_flash_config_tegra194() {
+tegraflash_create_flash_config:tegra194() {
    local destdir="$1"
    local lnxfile="$2"
    local cbotag
@@ -273,7 +273,7 @@ tegraflash_create_flash_config_tegra194() {
 }

 BOOTFILES = ""
-BOOTFILES_tegra210 = "\
+BOOTFILES:tegra210 = "\
    eks.img \
    nvtboot_recovery.bin \
    nvtboot.bin \
@@ -282,7 +282,7 @@ BOOTFILES_tegra210 = "\
    rp4.blob \
    sc7entry-firmware.bin \
 "
-BOOTFILES_tegra186 = "\
+BOOTFILES:tegra186 = "\
    adsp-fw.bin \
    bpmp.bin \
    camera-rtcpu-sce.img \
@@ -304,7 +304,7 @@ BOOTFILES_tegra186 = "\
    emmc.cfg \
 "

-BOOTFILES_tegra194 = "\
+BOOTFILES:tegra194 = "\
    adsp-fw.bin \
    bpmp_t194.bin \
    camera-rtcpu-rce.img \
@@ -329,7 +329,7 @@ create_tegraflash_pkg() {
    :
 }

-create_tegraflash_pkg_tegra210() {
+create_tegraflash_pkg:tegra210() {
    PATH="${STAGING_BINDIR_NATIVE}/tegra210-flash:${PATH}"
    rm -rf "${WORKDIR}/tegraflash"
    mkdir -p "${WORKDIR}/tegraflash"
@@ -403,7 +403,7 @@ END
    cd $oldwd
 }

-create_tegraflash_pkg_tegra186() {
+create_tegraflash_pkg:tegra186() {
    local f
    PATH="${STAGING_BINDIR_NATIVE}/tegra186-flash:${PATH}"
    rm -rf "${WORKDIR}/tegraflash"
@@ -481,7 +481,7 @@ END
    cd $oldwd
 }

-create_tegraflash_pkg_tegra194() {
+create_tegraflash_pkg:tegra194() {
    local f
    PATH="${STAGING_BINDIR_NATIVE}/tegra186-flash:${PATH}"
    rm -rf "${WORKDIR}/tegraflash"
@@ -616,7 +616,7 @@ EOF
    chmod +x $outfile
 }

-IMAGE_CMD_tegraflash = "create_tegraflash_pkg"
+IMAGE_CMD:tegraflash = "create_tegraflash_pkg"
 TEGRAFLASH_PKG_DEPENDS = "${@'zip-native:do_populate_sysroot' if d.getVar('TEGRAFLASH_PACKAGE_FORMAT') == 'zip' else '${CONVERSION_DEPENDS_gz}:do_populate_sysroot'}"
 do_image_tegraflash[depends] += "${TEGRAFLASH_PKG_DEPENDS} dtc-native:do_populate_sysroot coreutils-native:do_populate_sysroot \
                                 ${SOC_FAMILY}-flashtools-native:do_populate_sysroot gptfdisk-native:do_populate_sysroot \
--- a/classes/l4t_deb_pkgfeed.bbclass
+++ b/classes/l4t_deb_pkgfeed.bbclass
@@ -5,7 +5,7 @@ L4T_DEB_FEED_BASE ??= "https://repo.download.nvidia.com/jetson"
 inherit l4t_bsp

 L4T_DEB_COMP_DEFAULT = "main"
-L4T_DEB_COMP_DEFAULT_x86-64 = "r${@'.'.join(d.getVar('L4T_VERSION').split('.')[0:2])}"
+L4T_DEB_COMP_DEFAULT:x86-64 = "r${@'.'.join(d.getVar('L4T_VERSION').split('.')[0:2])}"
 L4T_DEB_COMP ?= "${L4T_DEB_COMP_DEFAULT}"

 def l4t_deb_src_uri(d):
@@ -45,9 +45,9 @@ SRC_URI = "${@l4t_deb_src_uri(d)}"
 do_unpack[depends] += "zstd-native:do_populate_sysroot"

 do_unpack[depends] += "tar-l4t-workaround-native:do_populate_sysroot"
-EXTRANATIVEPATH_append_task-unpack = " tar-l4t-workaround-native"
+EXTRANATIVEPATH:append_task-unpack = " tar-l4t-workaround-native"

-do_unpack_prepend() {
+do_unpack:prepend() {
    path = d.getVar('PATH')
    subpath = ':'.join([p for p in path.split(':') if 'tar-l4t-workaround-native' not in p])
    os.environ['TAR_WRAPPER_STRIPPED_PATH'] = subpath
--- a/conf/machine/include/tegra-common.inc
+++ b/conf/machine/include/tegra-common.inc
@@ -1,7 +1,7 @@
 MACHINEOVERRIDES =. "cuda:tegra:"
 SOC_FAMILY_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}_${SOC_FAMILY}"
-TEGRA_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}_tegra"
-PACKAGE_EXTRA_ARCHS_append = " ${TEGRA_PKGARCH} ${SOC_FAMILY_PKGARCH}"
+TEGRA_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU:}:tegra"
+PACKAGE_EXTRA_ARCHS:append = " ${TEGRA_PKGARCH} ${SOC_FAMILY_PKGARCH}"

 KERNEL_IMAGETYPES ?= "Image.gz Image"
 KERNEL_IMAGETYPE ?= "Image.gz"
@@ -35,7 +35,7 @@ PREFERRED_PROVIDER_virtual/bootlogo ?= "bootlogo-prebuilt"

 IMAGE_ROOTFS_ALIGNMENT ?= "4"
 TEGRA_BLBLOCKSIZE ?= "${@int(d.getVar('IMAGE_ROOTFS_ALIGNMENT')) * 1024}"
-EXTRA_IMAGECMD_ext4 ?= "-i 4096 -b 4096"
+EXTRA_IMAGECMD:ext4 ?= "-i 4096 -b 4096"
 IMAGE_CLASSES += "image_types_tegra"
 IMAGE_FSTYPES ?= "tegraflash"

--- a/conf/machine/include/tegra186.inc
+++ b/conf/machine/include/tegra186.inc
@@ -13,7 +13,7 @@ TEGRA_ESSENTIAL_EXTRA_RDEPENDS = "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/
 INITRAMFS_IMAGE ?= "tegra-minimal-initramfs"
 INITRAMFS_IMAGE_BUNDLE ?= "${@'1' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}"
 IMAGE_UBOOT ?= "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else 'u-boot'}"
-INITRAMFS_FSTYPES_append = "${@'' if not (d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1') else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}"
+INITRAMFS_FSTYPES:append = "${@'' if not (d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1') else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}"

 TEGRA_AUDIO_DEVICE ?= "tegrahda"

--- a/conf/machine/include/tegra194.inc
+++ b/conf/machine/include/tegra194.inc
@@ -9,7 +9,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc
 INITRAMFS_IMAGE ?= "tegra-minimal-initramfs"
 INITRAMFS_IMAGE_BUNDLE ?= "1"
 IMAGE_UBOOT ?= ""
-INITRAMFS_FSTYPES_append = "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}"
+INITRAMFS_FSTYPES:append = "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}"

 TEGRA_AUDIO_DEVICE ?= "tegrahdat194ref"

--- a/contrib/recipes-devtools/gcc-7/gcc-7.3.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-7.3.inc
@@ -97,7 +97,7 @@ JAVA = ""

 LTO = "--enable-lto"
 SSP ?= "--disable-libssp"
-SSP_mingw32 = "--enable-libssp"
+SSP:mingw32 = "--enable-libssp"

 EXTRA_OECONF_BASE = "\
    ${LTO} \
--- a/contrib/recipes-devtools/gcc-7/gcc-common.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-common.inc
@@ -11,7 +11,7 @@ inherit autotools gettext texinfo

 BPN = "gcc"
 COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir"
-COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir"
+COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir"

 python extract_stashed_builddir () {
    src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}")
@@ -45,7 +45,7 @@ def get_long_double_setting(bb, d):
    if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'glibc' ]:
        return "--with-long-double-128"
    else:
-        return "--without-long-double-128 libgcc_cv_powerpc_float128=no"
+        return "--without-long-double-128 libgcc_cv:powerpc_float128=no"
    return ""

 def get_gcc_multiarch_setting(bb, d):
@@ -88,7 +88,7 @@ def get_tune_parameters(tune, d):

 get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS"

-DEBIANNAME_${MLPREFIX}libgcc = "libgcc1"
+DEBIANNAME:${MLPREFIX}libgcc = "libgcc1"

 MIRRORS =+ "\
 ${GNU_MIRROR}/gcc    ftp://gcc.gnu.org/pub/gcc/releases/ \n \
--- a/contrib/recipes-devtools/gcc-7/gcc-configure-common.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-configure-common.inc
@@ -7,9 +7,9 @@ require gcc-shared-source.inc

 # Java (gcj doesn't work on all architectures)
 JAVA ?= ",java"
-JAVA_arm ?= ""
-JAVA_armeb ?= ""
-JAVA_mipsel ?= ""
+JAVA:arm ?= ""
+JAVA:armeb ?= ""
+JAVA:mipsel ?= ""
 JAVA_sh3 ?= ""
 # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
 FORTRAN ?= ",f77"
@@ -48,27 +48,27 @@ EXTRA_OECONF = "\

 # glibc version is a minimum controlling whether features are enabled. 
 # Doesn't need to track glibc exactly
-EXTRA_OECONF_append_libc-glibc = " --with-glibc-version=2.28 "
+EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 "

 # Set this here since GCC configure won't auto-detect and enable
 # initfini-arry when cross compiling.
-EXTRA_OECONF_append = " --enable-initfini-array"
+EXTRA_OECONF:append = " --enable-initfini-array"

 export gcc_cv_collect2_libs = 'none required'
 # We need to set gcc_cv_collect2_libs else there is cross-compilation badness
 # in the config.log files (which might not get generated until do_compile
 # hence being missed by the insane do_configure check).

-EXTRA_OECONF_append_linux = " --enable-__cxa_atexit"
+EXTRA_OECONF:append_linux = " --enable-__cxa_atexit"

-EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6"
-EXTRA_OECONF_append_mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6"
-EXTRA_OECONF_append_mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6"
-EXTRA_OECONF_append_mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6"
+EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6"
+EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6"

 EXTRA_OECONF_GCC_FLOAT ??= ""
 CPPFLAGS = ""
@@ -77,7 +77,7 @@ SYSTEMHEADERS = "${target_includedir}"
 SYSTEMLIBS = "${target_base_libdir}/"
 SYSTEMLIBS1 = "${target_libdir}/"

-do_configure_prepend () {
+do_configure:prepend () {
 	# teach gcc to find correct target includedir when checking libc ssp support
 	mkdir -p ${B}/gcc
 	echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
--- a/contrib/recipes-devtools/gcc-7/gcc-cross-canadian.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-cross-canadian.inc
@@ -65,7 +65,7 @@ do_compile () {

 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc"

-FILES_${PN} = "\
+FILES:${PN} = "\
    ${exec_prefix}/bin/* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
@@ -80,9 +80,9 @@ FILES_${PN} = "\
    ${prefix}/${TARGET_SYS}/lib/* \
    ${prefix}/${TARGET_SYS}${target_includedir}/* \
 "
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP:${PN} += "dev-so"

-FILES_${PN}-doc = "\
+FILES:${PN}-doc = "\
    ${infodir} \
    ${mandir} \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
@@ -149,7 +149,7 @@ do_install () {

 ELFUTILS = "nativesdk-elfutils"
 DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
-RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
+RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"

 SYSTEMHEADERS = "${target_includedir}/"
 SYSTEMLIBS = "${target_base_libdir}/"
@@ -157,9 +157,9 @@ SYSTEMLIBS1 = "${target_libdir}/"

 EXTRA_OECONF += "--enable-poison-system-directories"

-EXTRA_OECONF_append_libc-baremetal = " --without-headers"
-EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist"
-EXTRA_OECONF_remove_libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}"
+EXTRA_OECONF:append:libc-baremetal = " --without-headers"
+EXTRA_OECONF:remove:libc-baremetal = "--with-sysroot=/not/exist"
+EXTRA_OECONF:remove:libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}"

 # gcc 4.7 needs -isystem
 export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
--- a/contrib/recipes-devtools/gcc-7/gcc-cross.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-cross.inc
@@ -22,7 +22,7 @@ require gcc-configure-common.inc
 LINKER_HASH_STYLE ?= "sysv"

 EXTRA_OECONF += "--enable-poison-system-directories"
-EXTRA_OECONF_append_sh4 = " \
+EXTRA_OECONF:append:sh4 = " \
    --with-multilib-list= \
    --enable-incomplete-targets \
 "
@@ -31,9 +31,9 @@ EXTRA_OECONF += "\
    --with-system-zlib \
 "

-EXTRA_OECONF_append_libc-baremetal = " --without-headers"
-EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix"
-EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix"
+EXTRA_OECONF:append:libc-baremetal = " --without-headers"
+EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix"
+EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix"

 EXTRA_OECONF_PATHS = "\
    --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
@@ -43,7 +43,7 @@ EXTRA_OECONF_PATHS = "\

 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"

-do_configure_prepend () {
+do_configure:prepend () {
 	install -d ${RECIPE_SYSROOT}${target_includedir}
 	touch ${RECIPE_SYSROOT}${target_includedir}/limits.h
 }
--- a/contrib/recipes-devtools/gcc-7/gcc-multilib-config.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-multilib-config.inc
@@ -170,7 +170,7 @@ python gcc_multilib_setup() {
    header_config_files = gcc_header_config_files[target_arch]

    ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE']
-    mltunes = [('DEFAULTTUNE_virtclass-multilib-%s' % ml) for ml in multilibs]
+    mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs]
    if mlprefix:
        mlindex = 0
        for ml in multilibs:
--- a/contrib/recipes-devtools/gcc-7/gcc-runtime.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-runtime.inc
@@ -6,7 +6,7 @@ SUMMARY = "Runtime libraries from GCC"
 # All gcc-runtime packages are now covered by the runtime exception.
 LICENSE = "GPL-3.0-with-GCC-exception"

-CXXFLAGS_remove = "-fvisibility-inlines-hidden"
+CXXFLAGS:remove = "-fvisibility-inlines-hidden"

 EXTRA_OECONF_PATHS = "\
    --with-gxx-include-dir=${includedir}/c++/${BINV} \
@@ -14,17 +14,17 @@ EXTRA_OECONF_PATHS = "\
    --with-build-sysroot=${STAGING_DIR_TARGET} \
 "

-EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"

 RUNTIMELIBITM = "libitm"
-RUNTIMELIBITM_arc = ""
-RUNTIMELIBITM_mipsarch = ""
-RUNTIMELIBITM_nios2 = ""
-RUNTIMELIBITM_microblaze = ""
-RUNTIMELIBITM_riscv32 = ""
-RUNTIMELIBITM_riscv64 = ""
+RUNTIMELIBITM:arc = ""
+RUNTIMELIBITM:mipsarch = ""
+RUNTIMELIBITM:nios2 = ""
+RUNTIMELIBITM:microblaze = ""
+RUNTIMELIBITM:riscv32 = ""
+RUNTIMELIBITM:riscv64 = ""
 RUNTIMELIBSSP ?= ""
-RUNTIMELIBSSP_mingw32 ?= "libssp"
+RUNTIMELIBSSP:mingw32 ?= "libssp"

 RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
    ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \
@@ -37,7 +37,7 @@ RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM
 SLIB = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
 SLIB_NEW = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"

-DEBUG_PREFIX_MAP_class-target = " \
+DEBUG_PREFIX_MAP:class-target = " \
   -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \
   -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \
   -fdebug-prefix-map=${SLIB}=${SLIB_NEW} \
@@ -91,7 +91,7 @@ do_install () {

 }

-do_install_append_class-target () {
+do_install:append:class-target () {
 	if [ "${TARGET_OS}" = "linux-gnuspe" ]; then
 		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 	fi
@@ -158,104 +158,104 @@ PACKAGES = "\
    libitm-staticdev \
 "
 # The base package doesn't exist, so we clear the recommends.
-RRECOMMENDS_${PN}-dbg = ""
+RRECOMMENDS:${PN}-dbg = ""

 # include python debugging scripts
-FILES_${PN}-dbg += "\
+FILES:${PN}-dbg += "\
    ${libdir}/libstdc++.so.*-gdb.py \
    ${datadir}/gcc-${BINV}/python/libstdcxx \
 "

-FILES_libg2c = "${target_libdir}/libg2c.so.*"
-SUMMARY_libg2c = "Companion runtime library for g77"
-FILES_libg2c-dev = "\
+FILES:libg2c = "${target_libdir}/libg2c.so.*"
+SUMMARY:libg2c = "Companion runtime library for g77"
+FILES:libg2c-dev = "\
    ${libdir}/libg2c.so \
    ${libdir}/libg2c.a \
    ${libdir}/libfrtbegin.a \
 "
-SUMMARY_libg2c-dev = "Companion runtime library for g77 - development files"
+SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files"

-FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-SUMMARY_libstdc++ = "GNU standard C++ library"
-FILES_libstdc++-dev = "\
+FILES:libstdc++ = "${libdir}/libstdc++.so.*"
+SUMMARY:libstdc++ = "GNU standard C++ library"
+FILES:libstdc++-dev = "\
    ${includedir}/c++/ \
    ${libdir}/libstdc++.so \
    ${libdir}/libstdc++*.la \
    ${libdir}/libsupc++.la \
 "
-SUMMARY_libstdc++-dev = "GNU standard C++ library - development files"
-FILES_libstdc++-staticdev = "\
+SUMMARY:libstdc++-dev = "GNU standard C++ library - development files"
+FILES:libstdc++-staticdev = "\
    ${libdir}/libstdc++*.a \
    ${libdir}/libsupc++.a \
 "
-SUMMARY_libstdc++-staticdev = "GNU standard C++ library - static development files"
+SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files"

-FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
-SUMMARY_libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files"
+FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
+SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files"

-FILES_libssp = "${libdir}/libssp.so.*"
-SUMMARY_libssp = "GNU stack smashing protection library"
-FILES_libssp-dev = "\
+FILES:libssp = "${libdir}/libssp.so.*"
+SUMMARY:libssp = "GNU stack smashing protection library"
+FILES:libssp-dev = "\
    ${libdir}/libssp*.so \
    ${libdir}/libssp*_nonshared.a \
    ${libdir}/libssp*.la \
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp \
 "
-SUMMARY_libssp-dev = "GNU stack smashing protection library - development files"
-FILES_libssp-staticdev = "${libdir}/libssp*.a"
-SUMMARY_libssp-staticdev = "GNU stack smashing protection library - static development files"
+SUMMARY:libssp-dev = "GNU stack smashing protection library - development files"
+FILES:libssp-staticdev = "${libdir}/libssp*.a"
+SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files"

-FILES_libquadmath = "${libdir}/libquadmath*.so.*"
-SUMMARY_libquadmath = "GNU quad-precision math library"
-FILES_libquadmath-dev = "\
+FILES:libquadmath = "${libdir}/libquadmath*.so.*"
+SUMMARY:libquadmath = "GNU quad-precision math library"
+FILES:libquadmath-dev = "\
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \
    ${libdir}/libquadmath*.so \
    ${libdir}/libquadmath.la \
 "
-SUMMARY_libquadmath-dev = "GNU quad-precision math library - development files"
-FILES_libquadmath-staticdev = "${libdir}/libquadmath.a"
-SUMMARY_libquadmath-staticdev = "GNU quad-precision math library - static development files"
+SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files"
+FILES:libquadmath-staticdev = "${libdir}/libquadmath.a"
+SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files"

 # NOTE: mudflap has been removed as of gcc 4.9 and has been superseded by the address sanitiser
-FILES_libmudflap = "${libdir}/libmudflap*.so.*"
-SUMMARY_libmudflap = "Pointer debugging library for gcc"
-FILES_libmudflap-dev = "\
+FILES:libmudflap = "${libdir}/libmudflap*.so.*"
+SUMMARY:libmudflap = "Pointer debugging library for gcc"
+FILES:libmudflap-dev = "\
    ${libdir}/libmudflap*.so \
    ${libdir}/libmudflap.la \
 "
-SUMMARY_libmudflap-dev = "Pointer debugging library for gcc - development files"
-FILES_libmudflap-staticdev = "${libdir}/libmudflap.a"
-SUMMARY_libmudflap-staticdev = "Pointer debugging library for gcc - static development files"
+SUMMARY:libmudflap-dev = "Pointer debugging library for gcc - development files"
+FILES:libmudflap-staticdev = "${libdir}/libmudflap.a"
+SUMMARY:libmudflap-staticdev = "Pointer debugging library for gcc - static development files"

-FILES_libgomp = "${libdir}/libgomp*${SOLIBS}"
-SUMMARY_libgomp = "GNU OpenMP parallel programming library"
-FILES_libgomp-dev = "\
+FILES:libgomp = "${libdir}/libgomp*${SOLIBS}"
+SUMMARY:libgomp = "GNU OpenMP parallel programming library"
+FILES:libgomp-dev = "\
    ${libdir}/libgomp*${SOLIBSDEV} \
    ${libdir}/libgomp*.la \
    ${libdir}/libgomp.spec \
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
 "
-SUMMARY_libgomp-dev = "GNU OpenMP parallel programming library - development files"
-FILES_libgomp-staticdev = "${libdir}/libgomp*.a"
-SUMMARY_libgomp-staticdev = "GNU OpenMP parallel programming library - static development files"
+SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files"
+FILES:libgomp-staticdev = "${libdir}/libgomp*.a"
+SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files"

-FILES_libatomic = "${libdir}/libatomic.so.*"
-SUMMARY_libatomic = "GNU C++11 atomics support library"
-FILES_libatomic-dev = "\
+FILES:libatomic = "${libdir}/libatomic.so.*"
+SUMMARY:libatomic = "GNU C++11 atomics support library"
+FILES:libatomic-dev = "\
    ${libdir}/libatomic.so \
    ${libdir}/libatomic.la \
 "
-SUMMARY_libatomic-dev = "GNU C++11 atomics support library - development files"
-FILES_libatomic-staticdev = "${libdir}/libatomic.a"
-SUMMARY_libatomic-staticdev = "GNU C++11 atomics support library - static development files"
+SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files"
+FILES:libatomic-staticdev = "${libdir}/libatomic.a"
+SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files"

-FILES_libitm = "${libdir}/libitm.so.*"
-SUMMARY_libitm = "GNU transactional memory support library"
-FILES_libitm-dev = "\
+FILES:libitm = "${libdir}/libitm.so.*"
+SUMMARY:libitm = "GNU transactional memory support library"
+FILES:libitm-dev = "\
    ${libdir}/libitm.so \
    ${libdir}/libitm.la \
    ${libdir}/libitm.spec \
 "
-SUMMARY_libitm-dev = "GNU transactional memory support library - development files"
-FILES_libitm-staticdev = "${libdir}/libitm.a"
-SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files"
+SUMMARY:libitm-dev = "GNU transactional memory support library - development files"
+FILES:libitm-staticdev = "${libdir}/libitm.a"
+SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files"
--- a/contrib/recipes-devtools/gcc-7/gcc-runtime_7.3.bb
+++ b/contrib/recipes-devtools/gcc-7/gcc-runtime_7.3.bb
@@ -1,7 +1,7 @@
 require gcc-${PV}.inc
 require gcc-runtime.inc

-FILES_libgomp-dev += "\
+FILES:libgomp-dev += "\
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/openacc.h \
 "

--- a/contrib/recipes-devtools/gcc-7/gcc-sanitizers.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-sanitizers.inc
@@ -42,7 +42,7 @@ do_install () {
 }

 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 DEPENDS = "gcc-runtime virtual/${TARGET_PREFIX}gcc"

 BBCLASSEXTEND = "nativesdk"
@@ -52,19 +52,19 @@ PACKAGES += "libasan libubsan liblsan libtsan"
 PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev"
 PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev"

-RDEPENDS_libasan += "libstdc++"
-RDEPENDS_libubsan += "libstdc++"
-RDEPENDS_liblsan += "libstdc++"
-RDEPENDS_libtsan += "libstdc++"
-RDEPENDS_libasan-dev += "${PN}"
-RDEPENDS_libubsan-dev += "${PN}"
-RDEPENDS_liblsan-dev += "${PN}"
-RDEPENDS_libtsan-dev += "${PN}"
-RRECOMMENDS_${PN} += "libasan libubsan"
-RRECOMMENDS_${PN}_append_x86 = " liblsan"
-RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan"
-RRECOMMENDS_${PN}_append_powerpc64 = " liblsan libtsan"
-RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan"
+RDEPENDS:libasan += "libstdc++"
+RDEPENDS:libubsan += "libstdc++"
+RDEPENDS:liblsan += "libstdc++"
+RDEPENDS:libtsan += "libstdc++"
+RDEPENDS:libasan-dev += "${PN}"
+RDEPENDS:libubsan-dev += "${PN}"
+RDEPENDS:liblsan-dev += "${PN}"
+RDEPENDS:libtsan-dev += "${PN}"
+RRECOMMENDS:${PN} += "libasan libubsan"
+RRECOMMENDS:${PN}:append:x86 = " liblsan"
+RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan"

 do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
@@ -73,37 +73,37 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlib
 # Only x86, powerpc, sparc, s390, arm, and aarch64 are supported
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux'
 # musl is currently broken entirely
-COMPATIBLE_HOST_libc-musl = 'null'
+COMPATIBLE_HOST:libc-musl = 'null'

-FILES_libasan += "${libdir}/libasan.so.*"
-FILES_libasan-dev += "\
+FILES:libasan += "${libdir}/libasan.so.*"
+FILES:libasan-dev += "\
    ${libdir}/libasan_preinit.o \
    ${libdir}/libasan.so \
    ${libdir}/libasan.la \
 "
-FILES_libasan-staticdev += "${libdir}/libasan.a"
+FILES:libasan-staticdev += "${libdir}/libasan.a"

-FILES_libubsan += "${libdir}/libubsan.so.*"
-FILES_libubsan-dev += "\
+FILES:libubsan += "${libdir}/libubsan.so.*"
+FILES:libubsan-dev += "\
    ${libdir}/libubsan.so \
    ${libdir}/libubsan.la \
 "
-FILES_libubsan-staticdev += "${libdir}/libubsan.a"
+FILES:libubsan-staticdev += "${libdir}/libubsan.a"

-FILES_liblsan += "${libdir}/liblsan.so.*"
-FILES_liblsan-dev += "\
+FILES:liblsan += "${libdir}/liblsan.so.*"
+FILES:liblsan-dev += "\
    ${libdir}/liblsan.so \
    ${libdir}/liblsan.la \
    ${libdir}/liblsan_preinit.o \
 "
-FILES_liblsan-staticdev += "${libdir}/liblsan.a"
+FILES:liblsan-staticdev += "${libdir}/liblsan.a"

-FILES_libtsan += "${libdir}/libtsan.so.*"
-FILES_libtsan-dev += "\
+FILES:libtsan += "${libdir}/libtsan.so.*"
+FILES:libtsan-dev += "\
    ${libdir}/libtsan.so \
    ${libdir}/libtsan.la \
    ${libdir}/libtsan_*.o \
 "
-FILES_libtsan-staticdev += "${libdir}/libtsan.a"
+FILES:libtsan-staticdev += "${libdir}/libtsan.a"

-FILES_${PN} = "${libdir}/*.spec ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/sanitizer/*.h"
+FILES:${PN} = "${libdir}/*.spec ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/sanitizer/*.h"
--- a/contrib/recipes-devtools/gcc-7/gcc-target.inc
+++ b/contrib/recipes-devtools/gcc-7/gcc-target.inc
@@ -7,7 +7,7 @@ EXTRA_OECONF_PATHS = "\
    --with-gxx-include-dir=${includedir}/c++/${BINV} \
 "

-EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"

 # Configure gcc running on the target to default to an architecture which will
 # be compatible with that of gcc-runtime (which is cross compiled to be target
@@ -17,9 +17,9 @@ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"

 ARMFPARCHEXT ?= ""

-EXTRA_OECONF_append_armv6 = " --with-arch=armv6${ARMFPARCHEXT}"
-EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}"
-EXTRA_OECONF_append_armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv6 = " --with-arch=armv6${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}"

 # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
 # set in subdir gcc, so subdir libcc1 can't use it, export it here to
@@ -40,7 +40,7 @@ PACKAGES = "\
    ${PN}-dbg \
 "

-FILES_${PN} = "\
+FILES:${PN} = "\
    ${bindir}/${TARGET_PREFIX}gcc* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
@@ -53,85 +53,85 @@ FILES_${PN} = "\
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
 "
-INSANE_SKIP_${PN} += "dev-so"
-RRECOMMENDS_${PN} += "\
+INSANE_SKIP:${PN} += "dev-so"
+RRECOMMENDS:${PN} += "\
    libssp \
    libssp-dev \
 "
-RDEPENDS_${PN} += "cpp"
+RDEPENDS:${PN} += "cpp"

-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \
 "
-FILES_${PN}-symlinks = "\
+FILES:${PN}-symlinks = "\
    ${bindir}/cc \
    ${bindir}/gcc \
    ${bindir}/gccbug \
 "

-FILES_${PN}-plugins = "\
+FILES:${PN}-plugins = "\
    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \
 "
-ALLOW_EMPTY_${PN}-plugins = "1"
+ALLOW_EMPTY:${PN}-plugins = "1"

-FILES_g77 = "\
+FILES:g77 = "\
    ${bindir}/${TARGET_PREFIX}g77 \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
 "
-FILES_g77-symlinks = "\
+FILES:g77-symlinks = "\
    ${bindir}/g77 \
    ${bindir}/f77 \
 "
-RRECOMMENDS_g77 = "\
+RRECOMMENDS:g77 = "\
    libg2c \
    libg2c-dev \
 "

-FILES_gfortran = "\
+FILES:gfortran = "\
    ${bindir}/${TARGET_PREFIX}gfortran \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
 "
-RRECOMMENDS_gfortran = "\
+RRECOMMENDS:gfortran = "\
    libquadmath \
    libquadmath-dev \
 "
-FILES_gfortran-symlinks = "\
+FILES:gfortran-symlinks = "\
    ${bindir}/gfortran \
    ${bindir}/f95"

-FILES_cpp = "\
+FILES:cpp = "\
    ${bindir}/${TARGET_PREFIX}cpp* \
    ${base_libdir}/cpp \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
-FILES_cpp-symlinks = "${bindir}/cpp"
+FILES:cpp-symlinks = "${bindir}/cpp"

-FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \
+FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \
    ${bindir}/${TARGET_PREFIX}gcov-tool* \
 "
-FILES_gcov-symlinks = "${bindir}/gcov \
+FILES:gcov-symlinks = "${bindir}/gcov \
    ${bindir}/gcov-tool \
 "

-FILES_g++ = "\
+FILES:g++ = "\
    ${bindir}/${TARGET_PREFIX}g++* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
 "
-FILES_g++-symlinks = "\
+FILES:g++-symlinks = "\
    ${bindir}/c++ \
    ${bindir}/g++ \
 "
-RRECOMMENDS_g++ = "\
+RRECOMMENDS:g++ = "\
    libstdc++ \
    libstdc++-dev \
    libatomic \
    libatomic-dev \
 "

-FILES_${PN}-doc = "\
+FILES:${PN}-doc = "\
    ${infodir} \
    ${mandir} \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
@@ -202,7 +202,7 @@ do_install () {
 	chown -R root:root ${D}
 }

-do_install_append () {
+do_install:append () {
        #
        # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header
        # files and places the modified files into
--- a/contrib/recipes-devtools/gcc-7/gcc_7.3.bb
+++ b/contrib/recipes-devtools/gcc-7/gcc_7.3.bb
@@ -4,7 +4,7 @@ require gcc-target.inc
 # Building with thumb enabled on armv4t armv5t fails with
 # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs
 # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output
-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"

 BBCLASSEXTEND = "nativesdk"
--- a/contrib/recipes-devtools/gcc-7/libgcc-common.inc
+++ b/contrib/recipes-devtools/gcc-7/libgcc-common.inc
@@ -44,16 +44,16 @@ do_install () {
 	rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include
 }

-do_install_append_libc-baremetal () {
+do_install:append:libc-baremetal () {
 	rmdir ${D}${base_libdir}
 }
-do_install_append_libc-newlib () {
+do_install:append:libc-newlib () {
 	rmdir ${D}${base_libdir}
 }

 # No rpm package is actually created but -dev depends on it, avoid dnf error
-RDEPENDS_${PN}-dev_libc-baremetal = ""
-RDEPENDS_${PN}-dev_libc-newlib = ""
+RDEPENDS:${PN}-dev:libc-baremetal = ""
+RDEPENDS:${PN}-dev:libc-newlib = ""

 BBCLASSEXTEND = "nativesdk"

@@ -98,9 +98,9 @@ fakeroot python do_multilib_install() {


    for ml in multilibs.split():
-        tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml)
+        tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml)
        if not tune:
-            bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml)
+            bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml)
            continue

        tune_parameters = get_tune_parameters(tune, d)
--- a/contrib/recipes-devtools/gcc-7/libgcc-initial.inc
+++ b/contrib/recipes-devtools/gcc-7/libgcc-initial.inc
@@ -42,17 +42,17 @@ inherit nopackages
 # We really only want this built by things that need it, not any recrdeptask
 deltask do_build

-do_configure_prepend () {
+do_configure:prepend () {
 	install -d ${STAGING_INCDIR}
 	touch ${STAGING_INCDIR}/limits.h
 	sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars
 	sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile
 }

-do_configure_append () {
+do_configure:append () {
 	sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile
 }

-do_install_append () {
+do_install:append () {
 	ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a
 }
--- a/contrib/recipes-devtools/gcc-7/libgcc.inc
+++ b/contrib/recipes-devtools/gcc-7/libgcc.inc
@@ -2,7 +2,7 @@ require libgcc-common.inc

 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc"

-do_install_append_class-target () {
+do_install:append:class-target () {
 	if [ "${TCLIBC}" != "glibc" ]; then
 		case "${TARGET_OS}" in
 			"linux-musl" | "linux-*spe") extra_target_os="linux";;
@@ -21,12 +21,12 @@ PACKAGES = "\

 # All libgcc source is marked with the exception.
 #
-LICENSE_${PN} = "GPL-3.0-with-GCC-exception"
-LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception"
-LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"


-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
    ${base_libdir}/libgcc*.so \
    ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \
    ${libdir}/${TARGET_SYS}/${BINV}* \
@@ -38,5 +38,5 @@ do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"

-INSANE_SKIP_${PN}-dev = "staticdev"
+INSANE_SKIP:${PN}-dev = "staticdev"

--- a/contrib/recipes-devtools/gcc-7/libgfortran.inc
+++ b/contrib/recipes-devtools/gcc-7/libgfortran.inc
@@ -53,8 +53,8 @@ PACKAGES = "\
    libgfortran-dev \
    libgfortran-staticdev \
 "
-FILES_${PN} = "${libdir}/libgfortran.so.*"
-FILES_${PN}-dev = "\
+FILES:${PN} = "${libdir}/libgfortran.so.*"
+FILES:${PN}-dev = "\
    ${libdir}/libgfortran*.so \
    ${libdir}/libgfortran.spec \
    ${libdir}/libgfortran.la \
@@ -62,9 +62,9 @@ FILES_${PN}-dev = "\
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \
 "
-FILES_${PN}-staticdev = "${libdir}/libgfortran.a"
+FILES:${PN}-staticdev = "${libdir}/libgfortran.a"

-INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev"
+INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev"

 do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
--- a/contrib/recipes-devtools/gcc-8/gcc-8.3.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-8.3.inc
@@ -94,7 +94,7 @@ JAVA = ""

 LTO = "--enable-lto"
 SSP ?= "--disable-libssp"
-SSP_mingw32 = "--enable-libssp"
+SSP:mingw32 = "--enable-libssp"

 EXTRA_OECONF_BASE = "\
    ${LTO} \
--- a/contrib/recipes-devtools/gcc-8/gcc-common.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-common.inc
@@ -12,7 +12,7 @@ inherit autotools gettext texinfo

 BPN = "gcc"
 COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir"
-COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir"
+COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir"

 python extract_stashed_builddir () {
    src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}")
@@ -46,7 +46,7 @@ def get_long_double_setting(bb, d):
    if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'glibc' ]:
        return "--with-long-double-128"
    else:
-        return "--without-long-double-128 libgcc_cv_powerpc_float128=no"
+        return "--without-long-double-128 libgcc_cv:powerpc_float128=no"
    return ""

 def get_gcc_multiarch_setting(bb, d):
@@ -89,7 +89,7 @@ def get_tune_parameters(tune, d):

 get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS"

-DEBIANNAME_${MLPREFIX}libgcc = "libgcc1"
+DEBIANNAME:${MLPREFIX}libgcc = "libgcc1"

 MIRRORS =+ "\
 ${GNU_MIRROR}/gcc    ftp://gcc.gnu.org/pub/gcc/releases/ \n \
--- a/contrib/recipes-devtools/gcc-8/gcc-configure-common.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-configure-common.inc
@@ -7,9 +7,9 @@ require gcc-shared-source.inc

 # Java (gcj doesn't work on all architectures)
 JAVA ?= ",java"
-JAVA_arm ?= ""
-JAVA_armeb ?= ""
-JAVA_mipsel ?= ""
+JAVA:arm ?= ""
+JAVA:armeb ?= ""
+JAVA:mipsel ?= ""
 JAVA_sh3 ?= ""
 # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
 FORTRAN ?= ",f77"
@@ -49,27 +49,27 @@ EXTRA_OECONF = "\

 # glibc version is a minimum controlling whether features are enabled. 
 # Doesn't need to track glibc exactly
-EXTRA_OECONF_append_libc-glibc = " --with-glibc-version=2.28 "
+EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 "

 # Set this here since GCC configure won't auto-detect and enable
 # initfini-arry when cross compiling.
-EXTRA_OECONF_append = " --enable-initfini-array"
+EXTRA_OECONF:append = " --enable-initfini-array"

 export gcc_cv_collect2_libs = 'none required'
 # We need to set gcc_cv_collect2_libs else there is cross-compilation badness
 # in the config.log files (which might not get generated until do_compile
 # hence being missed by the insane do_configure check).

-EXTRA_OECONF_append_linux = " --enable-__cxa_atexit"
+EXTRA_OECONF:append_linux = " --enable-__cxa_atexit"

-EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
-EXTRA_OECONF_append_mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6"
-EXTRA_OECONF_append_mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6"
-EXTRA_OECONF_append_mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6"
-EXTRA_OECONF_append_mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6"
+EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6"
+EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6"

 EXTRA_OECONF_GCC_FLOAT ??= ""
 CPPFLAGS = ""
@@ -78,7 +78,7 @@ SYSTEMHEADERS = "${target_includedir}"
 SYSTEMLIBS = "${target_base_libdir}/"
 SYSTEMLIBS1 = "${target_libdir}/"

-do_configure_prepend () {
+do_configure:prepend () {
 	# teach gcc to find correct target includedir when checking libc ssp support
 	mkdir -p ${B}/gcc
 	echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
--- a/contrib/recipes-devtools/gcc-8/gcc-cross-canadian.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-cross-canadian.inc
@@ -65,7 +65,7 @@ do_compile () {

 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc"

-FILES_${PN} = "\
+FILES:${PN} = "\
    ${exec_prefix}/bin/* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
@@ -80,9 +80,9 @@ FILES_${PN} = "\
    ${prefix}/${TARGET_SYS}/lib/* \
    ${prefix}/${TARGET_SYS}${target_includedir}/* \
 "
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP:${PN} += "dev-so"

-FILES_${PN}-doc = "\
+FILES:${PN}-doc = "\
    ${infodir} \
    ${mandir} \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
@@ -166,16 +166,16 @@ do_install () {

 ELFUTILS = "nativesdk-elfutils"
 DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
-RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
+RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"

 SYSTEMHEADERS = "${target_includedir}/"
 SYSTEMLIBS = "${target_base_libdir}/"
 SYSTEMLIBS1 = "${target_libdir}/"

 EXTRA_OECONF += "--enable-poison-system-directories"
-EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist"
-EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist"
-EXTRA_OECONF_append_elf = " --without-headers --with-newlib"
-EXTRA_OECONF_append_eabi = " --without-headers --with-newlib"
+EXTRA_OECONF:remove_elf = "--with-sysroot=/not/exist"
+EXTRA_OECONF:remove_eabi = "--with-sysroot=/not/exist"
+EXTRA_OECONF:append_elf = " --without-headers --with-newlib"
+EXTRA_OECONF:append_eabi = " --without-headers --with-newlib"
 # gcc 4.7 needs -isystem
 export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
--- a/contrib/recipes-devtools/gcc-8/gcc-cross.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-cross.inc
@@ -22,7 +22,7 @@ require gcc-configure-common.inc
 LINKER_HASH_STYLE ?= "sysv"

 EXTRA_OECONF += "--enable-poison-system-directories"
-EXTRA_OECONF_append_sh4 = " \
+EXTRA_OECONF:append:sh4 = " \
    --with-multilib-list= \
    --enable-incomplete-targets \
 "
@@ -31,9 +31,9 @@ EXTRA_OECONF += "\
    --with-system-zlib \
 "

-EXTRA_OECONF_append_libc-baremetal = " --without-headers"
-EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix"
-EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix"
+EXTRA_OECONF:append:libc-baremetal = " --without-headers"
+EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix"
+EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix"

 EXTRA_OECONF_PATHS = "\
    --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
@@ -44,7 +44,7 @@ EXTRA_OECONF_PATHS = "\
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"


-do_configure_prepend () {
+do_configure:prepend () {
 	install -d ${RECIPE_SYSROOT}${target_includedir}
 	touch ${RECIPE_SYSROOT}${target_includedir}/limits.h
 }
--- a/contrib/recipes-devtools/gcc-8/gcc-multilib-config.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-multilib-config.inc
@@ -170,7 +170,7 @@ python gcc_multilib_setup() {
    header_config_files = gcc_header_config_files[target_arch]

    ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE']
-    mltunes = [('DEFAULTTUNE_virtclass-multilib-%s' % ml) for ml in multilibs]
+    mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs]
    if mlprefix:
        mlindex = 0
        for ml in multilibs:
--- a/contrib/recipes-devtools/gcc-8/gcc-runtime.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-runtime.inc
@@ -6,7 +6,7 @@ SUMMARY = "Runtime libraries from GCC"
 # All gcc-runtime packages are now covered by the runtime exception.
 LICENSE = "GPL-3.0-with-GCC-exception"

-CXXFLAGS_remove = "-fvisibility-inlines-hidden"
+CXXFLAGS:remove = "-fvisibility-inlines-hidden"

 EXTRA_OECONF_PATHS = "\
    --with-gxx-include-dir=${includedir}/c++/${BINV} \
@@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "\
    --with-build-sysroot=${STAGING_DIR_TARGET} \
 "

-EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
-EXTRA_OECONF_append = " --cache-file=${B}/config.cache"
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"
+EXTRA_OECONF:append = " --cache-file=${B}/config.cache"

 RUNTIMELIBITM = "libitm"
-RUNTIMELIBITM_arc = ""
-RUNTIMELIBITM_mipsarch = ""
-RUNTIMELIBITM_nios2 = ""
-RUNTIMELIBITM_microblaze = ""
-RUNTIMELIBITM_riscv32 = ""
-RUNTIMELIBITM_riscv64 = ""
+RUNTIMELIBITM:arc = ""
+RUNTIMELIBITM:mipsarch = ""
+RUNTIMELIBITM:nios2 = ""
+RUNTIMELIBITM:microblaze = ""
+RUNTIMELIBITM:riscv32 = ""
+RUNTIMELIBITM:riscv64 = ""
 RUNTIMELIBSSP ?= ""
-RUNTIMELIBSSP_mingw32 ?= "libssp"
+RUNTIMELIBSSP:mingw32 ?= "libssp"

 RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
    ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \
@@ -37,7 +37,7 @@ RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM
 SLIB = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
 SLIB_NEW = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"

-DEBUG_PREFIX_MAP_class-target = " \
+DEBUG_PREFIX_MAP:class-target = " \
   -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \
   -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \
   -fdebug-prefix-map=${SLIB}=${SLIB_NEW} \
@@ -92,7 +92,7 @@ do_install () {
 	fi
 }

-do_install_append_class-target () {
+do_install:append:class-target () {
 	if [ "${TARGET_OS}" = "linux-gnuspe" ]; then
 		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 	fi
@@ -169,67 +169,67 @@ PACKAGES = "\
    libitm-staticdev \
 "
 # The base package doesn't exist, so we clear the recommends.
-RRECOMMENDS_${PN}-dbg = ""
+RRECOMMENDS:${PN}-dbg = ""

 # include python debugging scripts
-FILES_${PN}-dbg += "\
+FILES:${PN}-dbg += "\
    ${libdir}/libstdc++.*-gdb.py \
    ${datadir}/gcc-${BINV}/python/libstdcxx \
 "

-FILES_libg2c = "${target_libdir}/libg2c.so.*"
-SUMMARY_libg2c = "Companion runtime library for g77"
-FILES_libg2c-dev = "\
+FILES:libg2c = "${target_libdir}/libg2c.so.*"
+SUMMARY:libg2c = "Companion runtime library for g77"
+FILES:libg2c-dev = "\
    ${libdir}/libg2c.so \
    ${libdir}/libg2c.a \
    ${libdir}/libfrtbegin.a \
 "
-SUMMARY_libg2c-dev = "Companion runtime library for g77 - development files"
+SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files"

-FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-SUMMARY_libstdc++ = "GNU standard C++ library"
-FILES_libstdc++-dev = "\
+FILES:libstdc++ = "${libdir}/libstdc++.so.*"
+SUMMARY:libstdc++ = "GNU standard C++ library"
+FILES:libstdc++-dev = "\
    ${includedir}/c++/ \
    ${libdir}/libstdc++.so \
    ${libdir}/libstdc++*.la \
    ${libdir}/libsupc++.la \
 "
-SUMMARY_libstdc++-dev = "GNU standard C++ library - development files"
-FILES_libstdc++-staticdev = "\
+SUMMARY:libstdc++-dev = "GNU standard C++ library - development files"
+FILES:libstdc++-staticdev = "\
    ${libdir}/libstdc++*.a \
    ${libdir}/libsupc++.a \
 "
-SUMMARY_libstdc++-staticdev = "GNU standard C++ library - static development files"
+SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files"

-FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
-SUMMARY_libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files"
+FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
+SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files"

-FILES_libssp = "${libdir}/libssp.so.*"
-SUMMARY_libssp = "GNU stack smashing protection library"
-FILES_libssp-dev = "\
+FILES:libssp = "${libdir}/libssp.so.*"
+SUMMARY:libssp = "GNU stack smashing protection library"
+FILES:libssp-dev = "\
    ${libdir}/libssp*.so \
    ${libdir}/libssp*_nonshared.a \
    ${libdir}/libssp*.la \
    ${libdir}/${TARGET_SYS}/${BINV}/include/ssp \
 "
-SUMMARY_libssp-dev = "GNU stack smashing protection library - development files"
-FILES_libssp-staticdev = "${libdir}/libssp*.a"
-SUMMARY_libssp-staticdev = "GNU stack smashing protection library - static development files"
+SUMMARY:libssp-dev = "GNU stack smashing protection library - development files"
+FILES:libssp-staticdev = "${libdir}/libssp*.a"
+SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files"

-FILES_libquadmath = "${libdir}/libquadmath*.so.*"
-SUMMARY_libquadmath = "GNU quad-precision math library"
-FILES_libquadmath-dev = "\
+FILES:libquadmath = "${libdir}/libquadmath*.so.*"
+SUMMARY:libquadmath = "GNU quad-precision math library"
+FILES:libquadmath-dev = "\
    ${libdir}/${TARGET_SYS}/${BINV}/include/quadmath* \
    ${libdir}/libquadmath*.so \
    ${libdir}/libquadmath.la \
 "
-SUMMARY_libquadmath-dev = "GNU quad-precision math library - development files"
-FILES_libquadmath-staticdev = "${libdir}/libquadmath.a"
-SUMMARY_libquadmath-staticdev = "GNU quad-precision math library - static development files"
+SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files"
+FILES:libquadmath-staticdev = "${libdir}/libquadmath.a"
+SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files"

-FILES_libgomp = "${libdir}/libgomp*${SOLIBS}"
-SUMMARY_libgomp = "GNU OpenMP parallel programming library"
-FILES_libgomp-dev = "\
+FILES:libgomp = "${libdir}/libgomp*${SOLIBS}"
+SUMMARY:libgomp = "GNU OpenMP parallel programming library"
+FILES:libgomp-dev = "\
    ${libdir}/libgomp*${SOLIBSDEV} \
    ${libdir}/libgomp*.la \
    ${libdir}/libgomp.spec \
@@ -237,27 +237,27 @@ FILES_libgomp-dev = "\
    ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \
    ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \
 "
-SUMMARY_libgomp-dev = "GNU OpenMP parallel programming library - development files"
-FILES_libgomp-staticdev = "${libdir}/libgomp*.a"
-SUMMARY_libgomp-staticdev = "GNU OpenMP parallel programming library - static development files"
+SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files"
+FILES:libgomp-staticdev = "${libdir}/libgomp*.a"
+SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files"

-FILES_libatomic = "${libdir}/libatomic.so.*"
-SUMMARY_libatomic = "GNU C++11 atomics support library"
-FILES_libatomic-dev = "\
+FILES:libatomic = "${libdir}/libatomic.so.*"
+SUMMARY:libatomic = "GNU C++11 atomics support library"
+FILES:libatomic-dev = "\
    ${libdir}/libatomic.so \
    ${libdir}/libatomic.la \
 "
-SUMMARY_libatomic-dev = "GNU C++11 atomics support library - development files"
-FILES_libatomic-staticdev = "${libdir}/libatomic.a"
-SUMMARY_libatomic-staticdev = "GNU C++11 atomics support library - static development files"
+SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files"
+FILES:libatomic-staticdev = "${libdir}/libatomic.a"
+SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files"

-FILES_libitm = "${libdir}/libitm.so.*"
-SUMMARY_libitm = "GNU transactional memory support library"
-FILES_libitm-dev = "\
+FILES:libitm = "${libdir}/libitm.so.*"
+SUMMARY:libitm = "GNU transactional memory support library"
+FILES:libitm-dev = "\
    ${libdir}/libitm.so \
    ${libdir}/libitm.la \
    ${libdir}/libitm.spec \
 "
-SUMMARY_libitm-dev = "GNU transactional memory support library - development files"
-FILES_libitm-staticdev = "${libdir}/libitm.a"
-SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files"
+SUMMARY:libitm-dev = "GNU transactional memory support library - development files"
+FILES:libitm-staticdev = "${libdir}/libitm.a"
+SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files"
--- a/contrib/recipes-devtools/gcc-8/gcc-runtime_8.3.bb
+++ b/contrib/recipes-devtools/gcc-8/gcc-runtime_8.3.bb
@@ -2,7 +2,7 @@ require gcc-${PV}.inc
 require gcc-runtime.inc

 # Disable ifuncs for libatomic on arm conflicts -march/-mcpu
-EXTRA_OECONF_append_arm = " libat_cv_have_ifunc=no "
+EXTRA_OECONF:append:arm = " libat_cv_have_ifunc=no "

 # Building with thumb enabled on armv6t fails
-ARM_INSTRUCTION_SET_armv6 = "arm"
+ARM_INSTRUCTION_SET:armv6 = "arm"
--- a/contrib/recipes-devtools/gcc-8/gcc-sanitizers.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-sanitizers.inc
@@ -47,7 +47,7 @@ do_install () {
 }

 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc"

 BBCLASSEXTEND = "nativesdk"
@@ -57,19 +57,19 @@ PACKAGES += "libasan libubsan liblsan libtsan"
 PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev"
 PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev"

-RDEPENDS_libasan += "libstdc++"
-RDEPENDS_libubsan += "libstdc++"
-RDEPENDS_liblsan += "libstdc++"
-RDEPENDS_libtsan += "libstdc++"
-RDEPENDS_libasan-dev += "${PN}"
-RDEPENDS_libubsan-dev += "${PN}"
-RDEPENDS_liblsan-dev += "${PN}"
-RDEPENDS_libtsan-dev += "${PN}"
-RRECOMMENDS_${PN} += "libasan libubsan"
-RRECOMMENDS_${PN}_append_x86 = " liblsan"
-RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan"
-RRECOMMENDS_${PN}_append_powerpc64 = " liblsan libtsan"
-RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan"
+RDEPENDS:libasan += "libstdc++"
+RDEPENDS:libubsan += "libstdc++"
+RDEPENDS:liblsan += "libstdc++"
+RDEPENDS:libtsan += "libstdc++"
+RDEPENDS:libasan-dev += "${PN}"
+RDEPENDS:libubsan-dev += "${PN}"
+RDEPENDS:liblsan-dev += "${PN}"
+RDEPENDS:libtsan-dev += "${PN}"
+RRECOMMENDS:${PN} += "libasan libubsan"
+RRECOMMENDS:${PN}:append:x86 = " liblsan"
+RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan"

 do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
@@ -78,37 +78,37 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlib
 # Only x86, powerpc, sparc, s390, arm, and aarch64 are supported
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux'
 # musl is currently broken entirely
-COMPATIBLE_HOST_libc-musl = 'null'
+COMPATIBLE_HOST:libc-musl = 'null'

-FILES_libasan += "${libdir}/libasan.so.*"
-FILES_libasan-dev += "\
+FILES:libasan += "${libdir}/libasan.so.*"
+FILES:libasan-dev += "\
    ${libdir}/libasan_preinit.o \
    ${libdir}/libasan.so \
    ${libdir}/libasan.la \
 "
-FILES_libasan-staticdev += "${libdir}/libasan.a"
+FILES:libasan-staticdev += "${libdir}/libasan.a"

-FILES_libubsan += "${libdir}/libubsan.so.*"
-FILES_libubsan-dev += "\
+FILES:libubsan += "${libdir}/libubsan.so.*"
+FILES:libubsan-dev += "\
    ${libdir}/libubsan.so \
    ${libdir}/libubsan.la \
 "
-FILES_libubsan-staticdev += "${libdir}/libubsan.a"
+FILES:libubsan-staticdev += "${libdir}/libubsan.a"

-FILES_liblsan += "${libdir}/liblsan.so.*"
-FILES_liblsan-dev += "\
+FILES:liblsan += "${libdir}/liblsan.so.*"
+FILES:liblsan-dev += "\
    ${libdir}/liblsan.so \
    ${libdir}/liblsan.la \
    ${libdir}/liblsan_preinit.o \
 "
-FILES_liblsan-staticdev += "${libdir}/liblsan.a"
+FILES:liblsan-staticdev += "${libdir}/liblsan.a"

-FILES_libtsan += "${libdir}/libtsan.so.*"
-FILES_libtsan-dev += "\
+FILES:libtsan += "${libdir}/libtsan.so.*"
+FILES:libtsan-dev += "\
    ${libdir}/libtsan.so \
    ${libdir}/libtsan.la \
    ${libdir}/libtsan_*.o \
 "
-FILES_libtsan-staticdev += "${libdir}/libtsan.a"
+FILES:libtsan-staticdev += "${libdir}/libtsan.a"

-FILES_${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h"
+FILES:${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h"
--- a/contrib/recipes-devtools/gcc-8/gcc-sanitizers_8.3.bb
+++ b/contrib/recipes-devtools/gcc-8/gcc-sanitizers_8.3.bb
@@ -3,5 +3,5 @@ require gcc-sanitizers.inc

 # Building with thumb enabled on armv4t armv5t fails with
 # sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8'
-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
--- a/contrib/recipes-devtools/gcc-8/gcc-target.inc
+++ b/contrib/recipes-devtools/gcc-8/gcc-target.inc
@@ -5,7 +5,7 @@ EXTRA_OECONF_PATHS = "\
    --with-build-sysroot=${STAGING_DIR_TARGET} \
 "

-EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"

 # Configure gcc running on the target to default to an architecture which will
 # be compatible with that of gcc-runtime (which is cross compiled to be target
@@ -15,10 +15,10 @@ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"

 ARMFPARCHEXT ?= ""

-EXTRA_OECONF_append_armv6_class-target = " --with-arch=armv6${ARMFPARCHEXT}"
-EXTRA_OECONF_append_armv7a_class-target = " --with-arch=armv7-a${ARMFPARCHEXT}"
-EXTRA_OECONF_append_armv7ve_class-target = " --with-arch=armv7ve${ARMFPARCHEXT}"
-EXTRA_OECONF_append_arc_class-target = " --with-cpu=${TUNE_PKGARCH}"
+EXTRA_OECONF:append:armv6:class-target = " --with-arch=armv6${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}"
+EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}"

 # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
 # set in subdir gcc, so subdir libcc1 can't use it, export it here to
@@ -39,7 +39,7 @@ PACKAGES = "\
    ${PN}-dbg \
 "

-FILES_${PN} = "\
+FILES:${PN} = "\
    ${bindir}/${TARGET_PREFIX}gcc* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
@@ -52,85 +52,85 @@ FILES_${PN} = "\
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
 "
-INSANE_SKIP_${PN} += "dev-so"
-RRECOMMENDS_${PN} += "\
+INSANE_SKIP:${PN} += "dev-so"
+RRECOMMENDS:${PN} += "\
    libssp \
    libssp-dev \
 "
-RDEPENDS_${PN} += "cpp"
+RDEPENDS:${PN} += "cpp"

-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \
 "
-FILES_${PN}-symlinks = "\
+FILES:${PN}-symlinks = "\
    ${bindir}/cc \
    ${bindir}/gcc \
    ${bindir}/gccbug \
 "

-FILES_${PN}-plugins = "\
+FILES:${PN}-plugins = "\
    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \
 "
-ALLOW_EMPTY_${PN}-plugins = "1"
+ALLOW_EMPTY:${PN}-plugins = "1"

-FILES_g77 = "\
+FILES:g77 = "\
    ${bindir}/${TARGET_PREFIX}g77 \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
 "
-FILES_g77-symlinks = "\
+FILES:g77-symlinks = "\
    ${bindir}/g77 \
    ${bindir}/f77 \
 "
-RRECOMMENDS_g77 = "\
+RRECOMMENDS:g77 = "\
    libg2c \
    libg2c-dev \
 "

-FILES_gfortran = "\
+FILES:gfortran = "\
    ${bindir}/${TARGET_PREFIX}gfortran \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
 "
-RRECOMMENDS_gfortran = "\
+RRECOMMENDS:gfortran = "\
    libquadmath \
    libquadmath-dev \
 "
-FILES_gfortran-symlinks = "\
+FILES:gfortran-symlinks = "\
    ${bindir}/gfortran \
    ${bindir}/f95"

-FILES_cpp = "\
+FILES:cpp = "\
    ${bindir}/${TARGET_PREFIX}cpp* \
    ${base_libdir}/cpp \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
-FILES_cpp-symlinks = "${bindir}/cpp"
+FILES:cpp-symlinks = "${bindir}/cpp"

-FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \
+FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \
    ${bindir}/${TARGET_PREFIX}gcov-tool* \
 "
-FILES_gcov-symlinks = "${bindir}/gcov \
+FILES:gcov-symlinks = "${bindir}/gcov \
    ${bindir}/gcov-tool \
 "

-FILES_g++ = "\
+FILES:g++ = "\
    ${bindir}/${TARGET_PREFIX}g++* \
    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
 "
-FILES_g++-symlinks = "\
+FILES:g++-symlinks = "\
    ${bindir}/c++ \
    ${bindir}/g++ \
 "
-RRECOMMENDS_g++ = "\
+RRECOMMENDS:g++ = "\
    libstdc++ \
    libstdc++-dev \
    libatomic \
    libatomic-dev \
 "

-FILES_${PN}-doc = "\
+FILES:${PN}-doc = "\
    ${infodir} \
    ${mandir} \
    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
@@ -216,7 +216,7 @@ do_install () {
 	chown -R root:root ${D}
 }

-do_install_append () {
+do_install:append () {
        #
        # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header
        # files and places the modified files into
--- a/contrib/recipes-devtools/gcc-8/gcc_8.3.bb
+++ b/contrib/recipes-devtools/gcc-8/gcc_8.3.bb
@@ -4,11 +4,11 @@ require gcc-target.inc
 # Building with thumb enabled on armv4t armv5t fails with
 # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs
 # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output
-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"

-ARMFPARCHEXT_armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
-ARMFPARCHEXT_armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
-ARMFPARCHEXT_armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"

 BBCLASSEXTEND = "nativesdk"
--- a/contrib/recipes-devtools/gcc-8/libgcc-common.inc
+++ b/contrib/recipes-devtools/gcc-8/libgcc-common.inc
@@ -44,16 +44,16 @@ do_install () {
 	rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include
 }

-do_install_append_libc-baremetal () {
+do_install:append:libc-baremetal () {
 	rmdir ${D}${base_libdir}
 }
-do_install_append_libc-newlib () {
+do_install:append:libc-newlib () {
 	rmdir ${D}${base_libdir}
 }

 # No rpm package is actually created but -dev depends on it, avoid dnf error
-RDEPENDS_${PN}-dev_libc-baremetal = ""
-RDEPENDS_${PN}-dev_libc-newlib = ""
+RDEPENDS:${PN}-dev:libc-baremetal = ""
+RDEPENDS:${PN}-dev:libc-newlib = ""

 BBCLASSEXTEND = "nativesdk"

@@ -98,9 +98,9 @@ fakeroot python do_multilib_install() {


    for ml in multilibs.split():
-        tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml)
+        tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml)
        if not tune:
-            bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml)
+            bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml)
            continue

        tune_parameters = get_tune_parameters(tune, d)
--- a/contrib/recipes-devtools/gcc-8/libgcc-initial.inc
+++ b/contrib/recipes-devtools/gcc-8/libgcc-initial.inc
@@ -42,17 +42,17 @@ inherit nopackages
 # We really only want this built by things that need it, not any recrdeptask
 deltask do_build

-do_configure_prepend () {
+do_configure:prepend () {
 	install -d ${STAGING_INCDIR}
 	touch ${STAGING_INCDIR}/limits.h
 	sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars
 	sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile
 }

-do_configure_append () {
+do_configure:append () {
 	sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile
 }

-do_install_append () {
+do_install:append () {
 	ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a
 }
--- a/contrib/recipes-devtools/gcc-8/libgcc-initial_8.3.bb
+++ b/contrib/recipes-devtools/gcc-8/libgcc-initial_8.3.bb
@@ -2,4 +2,4 @@ require gcc-${PV}.inc
 require libgcc-initial.inc

 # Building with thumb enabled on armv6t fails
-ARM_INSTRUCTION_SET_armv6 = "arm"
+ARM_INSTRUCTION_SET:armv6 = "arm"
--- a/contrib/recipes-devtools/gcc-8/libgcc.inc
+++ b/contrib/recipes-devtools/gcc-8/libgcc.inc
@@ -2,7 +2,7 @@ require libgcc-common.inc

 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc"

-do_install_append_class-target () {
+do_install:append:class-target () {
 	if [ "${TCLIBC}" != "glibc" ]; then
 		case "${TARGET_OS}" in
 			"linux-musl" | "linux-*spe") extra_target_os="linux";;
@@ -32,12 +32,12 @@ PACKAGES = "\

 # All libgcc source is marked with the exception.
 #
-LICENSE_${PN} = "GPL-3.0-with-GCC-exception"
-LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception"
-LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"


-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
    ${base_libdir}/libgcc*.so \
    ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \
    ${libdir}/${TARGET_SYS}/${BINV}* \
@@ -49,5 +49,5 @@ do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"

-INSANE_SKIP_${PN}-dev = "staticdev"
+INSANE_SKIP:${PN}-dev = "staticdev"

--- a/contrib/recipes-devtools/gcc-8/libgcc_8.3.bb
+++ b/contrib/recipes-devtools/gcc-8/libgcc_8.3.bb
@@ -2,4 +2,4 @@ require gcc-${PV}.inc
 require libgcc.inc

 # Building with thumb enabled on armv6t fails
-ARM_INSTRUCTION_SET_armv6 = "arm"
+ARM_INSTRUCTION_SET:armv6 = "arm"
--- a/contrib/recipes-devtools/gcc-8/libgfortran.inc
+++ b/contrib/recipes-devtools/gcc-8/libgfortran.inc
@@ -54,12 +54,12 @@ PACKAGES = "\
    libgfortran-staticdev \
 "

-LICENSE_${PN} = "GPL-3.0-with-GCC-exception"
-LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception"
-LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"

-FILES_${PN} = "${libdir}/libgfortran.so.*"
-FILES_${PN}-dev = "\
+FILES:${PN} = "${libdir}/libgfortran.so.*"
+FILES:${PN}-dev = "\
    ${libdir}/libgfortran*.so \
    ${libdir}/libgfortran.spec \
    ${libdir}/libgfortran.la \
@@ -68,9 +68,9 @@ FILES_${PN}-dev = "\
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \
    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ \
 "
-FILES_${PN}-staticdev = "${libdir}/libgfortran.a"
+FILES:${PN}-staticdev = "${libdir}/libgfortran.a"

-INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev"
+INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev"

 do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
 do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
--- a/contrib/recipes-devtools/gcc-linaro-baremetal/gcc-linaro-baremetal-arm-native_7.4.1-2019.02.bb
+++ b/contrib/recipes-devtools/gcc-linaro-baremetal/gcc-linaro-baremetal-arm-native_7.4.1-2019.02.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL-3.0-with-GCC-exception & LGPLv3 & GPLv3 & GFDL-1.3"
 SECTION = "devel"

 BASEVER = "${@'.'.join(d.getVar('PV').split('.')[0:2]) + '-' + d.getVar('PV').split('-')[1]}"
-SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/${BASEVER}/arm-eabi/gcc-linaro-${PV}-x86_64_arm-eabi.tar.xz"
+SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/${BASEVER}/arm-eabi/gcc-linaro-${PV}-x86_64:arm-eabi.tar.xz"
 SRC_URI[md5sum] = "0a8e5b7b67d713ece5fe24b120393b03"
 SRC_URI[sha256sum] = "d4ae43bd325f3a8df2bcfcc1909c1c28356e1e9f5705e21790b17c68830733d7"

@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://share/doc/gcc/Copying.html;md5=4d3dd12c455cd0ef6a53be

 inherit native

-S = "${WORKDIR}/gcc-linaro-${PV}-x86_64_arm-eabi"
+S = "${WORKDIR}/gcc-linaro-${PV}-x86_64:arm-eabi"

 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gst-examples_git.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gst-examples_git.bb
@@ -19,14 +19,14 @@ inherit meson pkgconfig features_check

 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"

-do_install_append() {
+do_install:append() {
 	install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
 }

-RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback"
-RRECOMMENDS_${PN} = "gstreamer1.0-plugins-base-meta \
+RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
+RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
                     gstreamer1.0-plugins-good-meta \
                     gstreamer1.0-plugins-bad-meta \
                      ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \
                     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
-RPROVIDES_${PN} += "gst-player gst-player-bin"
+RPROVIDES:${PN} += "gst-player gst-player-bin"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gst-plugins-package.inc
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gst-plugins-package.inc
@@ -1,5 +1,5 @@
-PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
-PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
+PACKAGESPLITFUNCS:prepend = " split_gstreamer10_packages "
+PACKAGESPLITFUNCS:append = " set_metapkg_rdepends "

 python split_gstreamer10_packages () {
    gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
@@ -19,8 +19,8 @@ python set_metapkg_rdepends () {

    pn = d.getVar('PN')
    metapkg =  pn + '-meta'
-    d.setVar('ALLOW_EMPTY_' + metapkg, "1")
-    d.setVar('FILES_' + metapkg, "")
+    d.setVar('ALLOW_EMPTY:' + metapkg, "1")
+    d.setVar('FILES:' + metapkg, "")
    blacklist = [ pn, pn + '-meta' ]
    metapkg_rdepends = []
    pkgdest = d.getVar('PKGDEST')
@@ -37,23 +37,23 @@ python set_metapkg_rdepends () {
            is_empty = len(dir_contents) == 0
            if not is_empty:
                metapkg_rdepends.append(pkg)
-    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
-    d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
+    d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
+    d.setVar('DESCRIPTION:' + metapkg, pn + ' meta package')
 }

 # each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
 # so we need them even when empty (like in gst-plugins-good case)
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-dev = "1"
-ALLOW_EMPTY_${PN}-staticdev = "1"
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-dev = "1"
+ALLOW_EMPTY:${PN}-staticdev = "1"

 PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"

 # Dynamically generate packages for all enabled plugins
 PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*"

-FILES_${PN} = ""
-FILES_${PN}-apps = "${bindir}"
-FILES_${PN}-glib = "${datadir}/glib-2.0"
+FILES:${PN} = ""
+FILES:${PN}-apps = "${bindir}"
+FILES:${PN}-glib = "${datadir}/glib-2.0"

-RRECOMMENDS_${PN} += "${PN}-meta"
+RRECOMMENDS:${PN} += "${PN}-meta"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gst-validate_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gst-validate_1.14.4.bb
@@ -13,9 +13,9 @@ SRC_URI[md5sum] = "1f4fc5308695adfdc11d13046aa4888c"
 SRC_URI[sha256sum] = "18dccca94bdc0bab3cddb07817bd280df7ab4abbec9a83b92620367a22d955c7"

 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
-RRECOMMENDS_${PN} = "git"
+RRECOMMENDS:${PN} = "git"

-FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"
+FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"

 inherit pkgconfig gettext autotools gobject-introspection gtk-doc upstream-version-is-even

--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-libav_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-libav_1.14.4.bb
@@ -50,21 +50,21 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
  --cross-prefix='${HOST_PREFIX}'"

 # Disable assembly optimizations for X32, as this libav lacks the support
-PACKAGECONFIG_remove_linux-gnux32 = "yasm"
-LIBAV_EXTRA_CONFIGURE_COMMON_ARG_append_linux-gnux32 = " --disable-asm"
+PACKAGECONFIG:remove:linux-gnux32 = "yasm"
+LIBAV_EXTRA_CONFIGURE_COMMON_ARG:append:linux-gnux32 = " --disable-asm"

 LIBAV_EXTRA_CONFIGURE_COMMON = \
 '${LIBAV_EXTRA_CONFIGURE}="${LIBAV_EXTRA_CONFIGURE_COMMON_ARG}"'

 EXTRA_OECONF = "${LIBAV_EXTRA_CONFIGURE_COMMON}"

-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"

 # http://errors.yoctoproject.org/Errors/Details/20493/
-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"

 # ffmpeg/libav disables PIC on some platforms (e.g. x86-32)
-INSANE_SKIP_${PN} = "textrel"
+INSANE_SKIP:${PN} = "textrel"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-meta-base.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-meta-base.bb
@@ -18,13 +18,13 @@ PACKAGES = "\
    gstreamer1.0-meta-debug \
    gstreamer1.0-meta-video"

-ALLOW_EMPTY_gstreamer1.0-meta-base = "1"
-ALLOW_EMPTY_gstreamer1.0-meta-x11-base = "1"
-ALLOW_EMPTY_gstreamer1.0-meta-audio = "1"
-ALLOW_EMPTY_gstreamer1.0-meta-debug = "1"
-ALLOW_EMPTY_gstreamer1.0-meta-video = "1"
+ALLOW_EMPTY:gstreamer1.0-meta-base = "1"
+ALLOW_EMPTY:gstreamer1.0-meta-x11-base = "1"
+ALLOW_EMPTY:gstreamer1.0-meta-audio = "1"
+ALLOW_EMPTY:gstreamer1.0-meta-debug = "1"
+ALLOW_EMPTY:gstreamer1.0-meta-video = "1"

-RDEPENDS_gstreamer1.0-meta-base = "\
+RDEPENDS:gstreamer1.0-meta-base = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \
    gstreamer1.0 \
    gstreamer1.0-plugins-base-playback \
@@ -39,11 +39,11 @@ RDEPENDS_gstreamer1.0-meta-base = "\
    gstreamer1.0-plugins-good-autodetect \
    gstreamer1.0-plugins-good-soup"

-RRECOMMENDS_gstreamer1.0-meta-x11-base = "\
+RRECOMMENDS:gstreamer1.0-meta-x11-base = "\
    gstreamer1.0-plugins-base-ximagesink \
    gstreamer1.0-plugins-base-xvimagesink"

-RDEPENDS_gstreamer1.0-meta-audio = "\
+RDEPENDS:gstreamer1.0-meta-audio = "\
    gstreamer1.0-meta-base \
    gstreamer1.0-plugins-base-vorbis \
    gstreamer1.0-plugins-base-ogg \
@@ -51,18 +51,18 @@ RDEPENDS_gstreamer1.0-meta-audio = "\
    gstreamer1.0-plugins-good-flac \
    ${COMMERCIAL_AUDIO_PLUGINS}"

-RDEPENDS_gstreamer1.0-meta-debug = "\
+RDEPENDS:gstreamer1.0-meta-debug = "\
    gstreamer1.0-meta-base \
    gstreamer1.0-plugins-good-debug \
    gstreamer1.0-plugins-base-audiotestsrc \
    gstreamer1.0-plugins-base-videotestsrc"

-RDEPENDS_gstreamer1.0-meta-video = "\
+RDEPENDS:gstreamer1.0-meta-video = "\
    gstreamer1.0-meta-base \
    gstreamer1.0-plugins-good-avi \
    gstreamer1.0-plugins-good-matroska \
    gstreamer1.0-plugins-base-theora \
    ${COMMERCIAL_VIDEO_PLUGINS}"

-RRECOMMENDS_gstreamer1.0-meta-video = "\
+RRECOMMENDS:gstreamer1.0-meta-video = "\
    gstreamer1.0-meta-audio"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb
@@ -50,8 +50,8 @@ set_omx_core_name() {
 }
 do_install[postfuncs] += " set_omx_core_name "

-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"

-RDEPENDS_${PN} = "libomxil"
+RDEPENDS:${PN} = "libomxil"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-bad_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-bad_1.14.4.bb
@@ -142,9 +142,9 @@ EXTRA_OECONF += " \

 export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"

-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"

-FILES_${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs"
-FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*"
-FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs"
+FILES:${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs"
+FILES:${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*"
+FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-base_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-base_1.14.4.bb
@@ -68,9 +68,9 @@ PACKAGECONFIG[x11]          = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
 PACKAGECONFIG[wayland]      = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
 PACKAGECONFIG[zlib]         = "--enable-zlib,--disable-zlib,zlib"

-FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
-FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
+FILES:${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
+FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"

-do_compile_prepend() {
+do_compile:prepend() {
        export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs:${B}/gst-libs/gst/allocators/.libs"
 }
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-good_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-good_1.14.4.bb
@@ -20,8 +20,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                    file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"

 DEPENDS += "gstreamer1.0-plugins-base libcap"
-RPROVIDES_${PN}-pulseaudio += "${PN}-pulse"
-RPROVIDES_${PN}-soup += "${PN}-souphttpsrc"
+RPROVIDES:${PN}-pulseaudio += "${PN}-pulse"
+RPROVIDES:${PN}-soup += "${PN}-souphttpsrc"

 inherit gettext

@@ -77,4 +77,4 @@ EXTRA_OECONF += " \
    --disable-waveform \
 "

-FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
+FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-ugly_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-ugly_1.14.4.bb
@@ -37,5 +37,5 @@ EXTRA_OECONF += " \
    --disable-sidplay \
 "

-FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
-FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
+FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
+FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins.inc
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins.inc
@@ -5,7 +5,7 @@ SECTION = "multimedia"

 DEPENDS = "gstreamer1.0 glib-2.0-native"

-SRC_URI_append = " file://gtk-doc-tweaks.patch"
+SRC_URI:append = " file://gtk-doc-tweaks.patch"

 inherit autotools pkgconfig upstream-version-is-even gtk-doc

--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-python_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-python_1.14.4.bb
@@ -10,7 +10,7 @@ SRC_URI[md5sum] = "d4c0e3915f547feef49208ee08981e5a"
 SRC_URI[sha256sum] = "d0fdb24f93b6d889f309d2f526b8ea9577e0084ff0a62b4623ef1aed52e85a1b"

 DEPENDS = "gstreamer1.0 python3-pygobject"
-RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject"
+RDEPENDS:${PN} += "gstreamer1.0 python3-pygobject"

 PNREAL = "gst-python"

@@ -18,11 +18,11 @@ S = "${WORKDIR}/${PNREAL}-${PV}"

 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
+UNKNOWN_CONFIGURE_WHITELIST:append = " --enable-introspection --disable-introspection"

 inherit autotools pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check

-do_install_append() {
+do_install:append() {
    # gstpythonplugin hardcodes the location of the libpython from the build
    # workspace and then fails at runtime. We can override it using
    # --with-libpython-dir=${libdir}, but it still fails because it looks for a
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-vaapi_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-vaapi_1.14.4.bb
@@ -45,7 +45,7 @@ PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl"
 PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender"

-FILES_${PN} += "${libdir}/gstreamer-*/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-*/*.la ${libdir}/gstreamer-*/*.a"
-FILES_${PN}-tests = "${bindir}/*"
+FILES:${PN} += "${libdir}/gstreamer-*/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-*/*.la ${libdir}/gstreamer-*/*.a"
+FILES:${PN}-tests = "${bindir}/*"
--- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0_1.14.4.bb
+++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0_1.14.4.bb
@@ -53,11 +53,11 @@ CACHED_CONFIGUREVARS += "ac_cv_header_sys_poll_h=no"

 PACKAGES += "${PN}-bash-completion"

-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include"
-FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*"
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include"
+FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*"

-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS:${PN}-ptest += "make"

 delete_pkg_m4_file() {
        # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection
@@ -67,7 +67,7 @@ delete_pkg_m4_file() {

 do_configure[prefuncs] += "delete_pkg_m4_file"

-do_compile_prepend() {
+do_compile:prepend() {
        export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
 }

--- a/contrib/recipes-test/tegra-tests/gpu-burn_git.bb
+++ b/contrib/recipes-test/tegra-tests/gpu-burn_git.bb
@@ -17,4 +17,4 @@ inherit cuda cmake pkgconfig
 EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX=/opt/cudatests"
 lcl_maybe_fortify = ""

-FILES_${PN} = "/opt/cudatests"
+FILES:${PN} = "/opt/cudatests"
--- a/external/meta-python/recipes-devtools/python3-tensorrt/python3-tensorrt_7.1.3-1.bb
+++ b/external/meta-python/recipes-devtools/python3-tensorrt/python3-tensorrt_7.1.3-1.bb
@@ -56,4 +56,4 @@ do_install() {
    distutils3_do_install
 }

-RDEPENDS_${PN} = "python3-ctypes python3-numpy"
+RDEPENDS:${PN} = "python3-ctypes python3-numpy"
--- a/external/openembedded-layer/recipes-kernel/spidev-test/spidev-test.bbappend
+++ b/external/openembedded-layer/recipes-kernel/spidev-test/spidev-test.bbappend
@@ -1,4 +1,4 @@
-do_install_tegra() {
+do_install:tegra() {
    if egrep -q '^([23]\.|4\.([0-9]|1[0-3])\.)' ${STAGING_KERNEL_BUILDDIR}/kernel-abiversion; then
 	install -d ${D}${bindir}
 	install -m 0755 ${S}/tools/spi/spidev_test ${S}/tools/spi/spidev_fdx ${D}${bindir}/
@@ -7,4 +7,4 @@ do_install_tegra() {
    fi
 }

-RRECOMMENDS_${PN}_append_tegra = " kernel-module-spidev"
+RRECOMMENDS:${PN}:append:tegra = " kernel-module-spidev"
--- a/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
+++ b/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
@@ -1,15 +1,15 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_tegra = " \
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append:tegra = " \
    file://0001-Make-plugin-directory-relative-to-ORIGIN.patch \
    file://0002-Replace-stat-fstat-calls-with-__xstat-__fxstat.patch \
 "

-EXTRA_OECONF_tegra = " --without-jpeg"
-DEPENDS_remove_tegra = "jpeg"
+EXTRA_OECONF:tegra = " --without-jpeg"
+DEPENDS:remove:tegra = "jpeg"

 TEGRA_PLUGINS ?= ""
-TEGRA_PLUGINS_tegra = "tegra-libraries-libv4l-plugins"
-RRECOMMENDS_libv4l += "${TEGRA_PLUGINS}"
+TEGRA_PLUGINS:tegra = "tegra-libraries-libv4l-plugins"
+RRECOMMENDS:libv4l += "${TEGRA_PLUGINS}"

 inherit container-runtime-csv
 CONTAINER_CSV_BASENAME = "libv4l"
@@ -17,6 +17,6 @@ CONTAINER_CSV_FILES = "${libdir}/*.so* ${libdir}/libv4l/ov* ${libdir}/libv4l/*.s
 # These files aren't in nvidia host-files-for-container.d/l4t.csv and conflict with attempts
 # to install v4l-utils inside the container (Invalid cross-device link)
 CONTAINER_CSV_EXCLUDE_FILES = "${libdir}/libv4l2rds*"
-RDEPENDS_libv4l_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}"
-RDEPENDS_${PN}_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}"
-PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
+RDEPENDS:libv4l:append:tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}"
+RDEPENDS:${PN}:remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}"
+PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}"
--- a/external/openembedded-layer/recipes-support/libusbgx/libusbgx-config.bbappend
+++ b/external/openembedded-layer/recipes-support/libusbgx/libusbgx-config.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"

-SRC_URI_append_tegra = " \
+SRC_URI:append:tegra = " \
    file://l4t.schema.in \
    file://usbgx-overrides.conf \
    file://l4t-gadget-config-setup.sh \
 "

-do_install_append_tegra() {
+do_install:append:tegra() {
    install -d ${D}${datadir}/usbgx
    install -m 0644 ${WORKDIR}/l4t.schema.in ${D}${datadir}/usbgx/
    install -d ${D}${sysconfdir}/usbgx
@@ -18,5 +18,5 @@ do_install_append_tegra() {
    sed -i -e's,^IMPORT_SCHEMAS=.*,IMPORT_SCHEMAS="l4t",' ${D}${sysconfdir}/default/usbgx
 }

-FILES_${PN} += "${datadir}/usbgx"
-PACKAGE_ARCH_tegra = "${MACHINE_ARCH}"
+FILES:${PN} += "${datadir}/usbgx"
+PACKAGE_ARCH:tegra = "${MACHINE_ARCH}"
--- a/external/openembedded-layer/recipes-support/libusbgx/libusbgx_%.bbappend
+++ b/external/openembedded-layer/recipes-support/libusbgx/libusbgx_%.bbappend
@@ -1,6 +1,6 @@
-PACKAGES_prepend_tegra = "${PN}-examples "
-FILES_${PN}-examples = "${bindir}/gadget-acm-ecm ${bindir}/gadget-export ${bindir}/gadget-ffs \
+PACKAGES::prepend:tegra = "${PN}-examples "
+FILES:${PN}-examples = "${bindir}/gadget-acm-ecm ${bindir}/gadget-export ${bindir}/gadget-ffs \
                        ${bindir}/gadget-hid ${bindir}/gadget-midi ${bindir}/gadget-ms \
                        ${bindir}/gadget-rndis-os-desc ${bindir}/gadget-uac2"
-RRECOMMENDS_${PN}_append_tegra = " kernel-module-tegra-xudc"
-PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}"
+RRECOMMENDS:${PN}:append:tegra = " kernel-module-tegra-xudc"
+PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}"
--- a/external/openembedded-layer/recipes-support/opencv/opencv_4.5.%.bbappend
+++ b/external/openembedded-layer/recipes-support/opencv/opencv_4.5.%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"

 inherit cuda

-EXTRA_OECMAKE_append_tegra210 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="5.3" -DCUDA_ARCH_PTX=""'
-EXTRA_OECMAKE_append_tegra186 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="6.2" -DCUDA_ARCH_PTX=""'
-EXTRA_OECMAKE_append_tegra194 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="7.2" -DCUDA_ARCH_PTX=""'
+EXTRA_OECMAKE:append:tegra210 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="5.3" -DCUDA_ARCH_PTX=""'
+EXTRA_OECMAKE:append:tegra186 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="6.2" -DCUDA_ARCH_PTX=""'
+EXTRA_OECMAKE:append:tegra194 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="7.2" -DCUDA_ARCH_PTX=""'

-EXTRA_OECMAKE_append = " -DOPENCV_GENERATE_PKGCONFIG=ON"
+EXTRA_OECMAKE:append = " -DOPENCV_GENERATE_PKGCONFIG=ON"

 OPTICALFLOW_MD5 = "a73cd48b18dcc0cc8933b30796074191"
 OPTICALFLOW_HASH = "edb50da3cf849840d680249aa6dbef248ebce2ca"
@@ -17,7 +17,7 @@ SRC_URI[opticalflow.md5sum] = "${OPTICALFLOW_MD5}"
 SRC_URI[opticalflow.sha256sum] = "e300c02e4900741700b2b857965d2589f803390849e1e2022732e02f4ae9be44"

 # No stable URI is available for NVIDIAOpticalFlowSDK
-INSANE_SKIP_append = " src-uri-bad"
+INSANE_SKIP:append = " src-uri-bad"

-DEPENDS_append_cuda = "${@' cudnn' if 'dnn' in d.getVar('PACKAGECONFIG') else ''}"
+DEPENDS:append:cuda = "${@' cudnn' if 'dnn' in d.getVar('PACKAGECONFIG') else ''}"
 SRC_URI += "file://0001-Fix-search-paths-in-FindCUDNN.cmake.patch"
--- a/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend
+++ b/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend
@@ -1,11 +1,11 @@
-do_install_append() {
+do_install:append() {
    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)};    then
        install -d ${D}${sysconfdir}/init.d
        install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
    fi
 }

-RRECOMMENDS_${PN}_append = " \
+RRECOMMENDS:${PN}:append = " \
    kernel-module-br-netfilter \
    kernel-module-esp4 \
    kernel-module-ip-vs \
--- a/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libnvidia-container-tools_0.9.0.bb
+++ b/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libnvidia-container-tools_0.9.0.bb
@@ -65,12 +65,12 @@ def build_date(d):
 # include bmake-native which does not exist at the moment.
 EXTRA_OEMAKE = "EXCLUDE_BUILD_FLAGS=1 PLATFORM=${HOST_ARCH} JETSON=TRUE WITH_LIBELF=yes ${@build_date(d)} ${PACKAGECONFIG_CONFARGS}"

-CFLAGS_prepend = " -I=/usr/include/tirpc-1.2.6 "
+CFLAGS:prepend = " -I=/usr/include/tirpc-1.2.6 "

 export OBJCPY="${OBJCOPY}"

 # Fix me: Create an independent recipe for nvidia-modprobe
-do_configure_append() {
+do_configure:append() {
    # Mark Nvidia modprobe as downloaded
    touch ${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}/.download_stamp
 }
@@ -79,4 +79,4 @@ do_install () {
    oe_runmake install DESTDIR=${D}
 }

-INSANE_SKIP_${PN} = "already-stripped"
+INSANE_SKIP:${PN} = "already-stripped"
--- a/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libtirpc126_1.2.6.bb
+++ b/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libtirpc126_1.2.6.bb
@@ -19,7 +19,7 @@ inherit autotools pkgconfig
 DISABLE_STATIC = ""
 EXTRA_OECONF = "--disable-gssapi --enable-static"

-do_install_append() {
+do_install:append() {
    rm -r ${D}${sysconfdir} ${D}${datadir} ${D}${libdir}/pkgconfig
    rm ${D}${libdir}/*.so*
    mv ${D}${includedir}/tirpc ${D}${includedir}/tirpc-1.2.6
--- a/external/virtualization-layer/recipes-containers/nvidia-container-runtime/nvidia-container-runtime_3.1.0.bb
+++ b/external/virtualization-layer/recipes-containers/nvidia-container-runtime/nvidia-container-runtime_3.1.0.bb
@@ -37,13 +37,13 @@ do_compile() {
    cd ${B}
 }

-do_install_append_tegra() {
+do_install:append:tegra() {
    install -d -m 755 ${D}${sysconfdir}/nvidia-container-runtime/host-files-for-container.d
    install -m 0644 ${WORKDIR}/l4t.csv ${D}${sysconfdir}/nvidia-container-runtime/host-files-for-container.d/l4t.csv
 }

-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
    nvidia-container-toolkit \
    docker-ce \
 "
-RDEPENDS_${PN}-dev += "bash make"
+RDEPENDS:${PN}-dev += "bash make"
--- a/external/virtualization-layer/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_1.0.5.bb
+++ b/external/virtualization-layer/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_1.0.5.bb
@@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "virtualization"

 inherit go features_check

-do_install_append(){
+do_install:append(){
    install -d ${D}${sysconfdir}/nvidia-container-runtime ${D}${libexecdir}/oci/hooks.d ${D}/${datadir}/oci/hooks.d
    install ${S}/src/${GO_IMPORT}/config/config.toml.centos ${D}${sysconfdir}/nvidia-container-runtime/config.toml
    install ${S}/src/${GO_IMPORT}/oci-nvidia-hook ${D}${libexecdir}/oci/hooks.d
@@ -31,10 +31,10 @@ do_install_append(){
    ln -sf nvidia-container-toolkit ${D}${bindir}/nvidia-container-runtime-hook
 }

-FILES_${PN} += "${datadir}/oci"
+FILES:${PN} += "${datadir}/oci"

-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
    libnvidia-container-tools \
    docker-ce \
 "
-RDEPENDS_${PN}-dev += "bash make"
+RDEPENDS:${PN}-dev += "bash make"
--- a/external/virtualization-layer/recipes-containers/nvidia-docker/nvidia-docker_2.2.2.bb
+++ b/external/virtualization-layer/recipes-containers/nvidia-docker/nvidia-docker_2.2.2.bb
@@ -29,4 +29,4 @@ do_install() {
    install -m 644 ${S}/daemon.json ${D}/${sysconfdir}/docker
 }

-RDEPENDS_${PN} = "nvidia-container-runtime bash"
+RDEPENDS:${PN} = "nvidia-container-runtime bash"
--- a/external/virtualization-layer/recipes-kernel/linux-tegra_%.bbappend
+++ b/external/virtualization-layer/recipes-kernel/linux-tegra_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

-SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'file://kvm.cfg', '', d)}"
+SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'file://kvm.cfg', '', d)}"
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,9 +1,9 @@
-PACKAGE_ARCH_tegra = "${MACHINE_ARCH}"
+PACKAGE_ARCH:tegra = "${MACHINE_ARCH}"

-do_install_append_tegra() {
+do_install:append:tegra() {
    rm ${D}${sysconfdir}/asound.conf
    rmdir ${D}${sysconfdir} 2>/dev/null || true
 }

-RDEPENDS_${PN}_append_tegra = " tegra-configs-alsa"
-ALLOW_EMPTY_${PN}_tegra = "1"
+RDEPENDS:${PN}:append:tegra = " tegra-configs-alsa"
+ALLOW_EMPTY:${PN:}:tegra = "1"
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -23,7 +23,7 @@ AS[unexport] = "1"
 LD[unexport] = "1"

 TARGET_SOC = "t186"
-TARGET_SOC_tegra194 = "t194"
+TARGET_SOC:tegra194 = "t194"

 def generate_build_timestamp(d):
    from datetime import datetime
@@ -38,7 +38,7 @@ BUILD_STRING ??= ""
 EXTRA_OEMAKE = 'BUILD_BASE=${B} CROSS_COMPILE="${TARGET_PREFIX}" PLAT=tegra \
 	        DEBUG=0 LOG_LEVEL=20 V=0 TARGET_SOC=${TARGET_SOC} ${BUILDTIMESTAMP} ${BUILD_STRING} ${PACKAGECONFIG_CONFARGS}'

-do_configure_append() {
+do_configure:append() {
 	oe_runmake -C ${S} clean
 }

@@ -51,6 +51,6 @@ do_install() {
 	install -m 0644 ${B}/tegra/${TARGET_SOC}/release/bl31.bin ${D}${datadir}/trusted-os/
 }

-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN}-dev = "${datadir}/trusted-os"
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN}-dev = "${datadir}/trusted-os"
 PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}"
--- a/recipes-bsp/bootlogo/bootlogo-custom_1.0.bb
+++ b/recipes-bsp/bootlogo/bootlogo-custom_1.0.bb
@@ -34,7 +34,7 @@ BMP_SYMLINK = "bootlogo-${MACHINE}.blob"
 include bootlogo.inc

 FLASHTOOLS_DIR = "${SOC_FAMILY}-flash"
-FLASHTOOLS_DIR_tegra194 = "tegra186-flash"
+FLASHTOOLS_DIR:tegra194 = "tegra186-flash"

 do_compile() {

--- a/recipes-bsp/cboot/cboot-extlinux.bb
+++ b/recipes-bsp/cboot/cboot-extlinux.bb
@@ -90,5 +90,5 @@ do_install() {
    install -m 0644 ${B}/extlinux.conf ${D}/boot/extlinux/
 }

-FILES_${PN} = "/boot"
+FILES:${PN} = "/boot"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/cboot/cboot-t18x_32.5.2.bb
+++ b/recipes-bsp/cboot/cboot-t18x_32.5.2.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[machine-id] = "CONFIG_ENABLE_MACHINE_ID=1,,"

 TARGET_SOC = "t186"
 COMPATIBLE_MACHINE = "(tegra186)"
-PROVIDES_append = "${@' virtual/bootloader' if (d.getVar('PREFERRED_PROVIDER_virtual/bootloader') or '').startswith('cboot') else ''}"
+PROVIDES:append = "${@' virtual/bootloader' if (d.getVar('PREFERRED_PROVIDER_virtual/bootloader') or '').startswith('cboot') else ''}"

 require cboot-l4t.inc
--- a/recipes-bsp/cboot/cboot-t19x_32.5.2.bb
+++ b/recipes-bsp/cboot/cboot-t19x_32.5.2.bb
@@ -32,7 +32,7 @@ PACKAGECONFIG[extlinux] = "CONFIG_ENABLE_EXTLINUX_BOOT=1,,"
 PACKAGECONFIG[machine-id] = "CONFIG_ENABLE_MACHINE_ID=1,,"

 # Xavier NX devkits *must* have this option, or they cannot boot from the SDcard:
-EXTRA_GLOBAL_DEFINES_append_jetson-xavier-nx-devkit = " CONFIG_ENABLE_BOOT_DEVICE_SELECT=1"
+EXTRA_GLOBAL_DEFINES:append:jetson-xavier-nx-devkit = " CONFIG_ENABLE_BOOT_DEVICE_SELECT=1"

 TARGET_SOC = "t194"
 COMPATIBLE_MACHINE = "(tegra194)"
--- a/recipes-bsp/l4t-usb-device-mode/l4t-usb-device-mode.bb
+++ b/recipes-bsp/l4t-usb-device-mode/l4t-usb-device-mode.bb
@@ -29,5 +29,5 @@ do_install() {
    install -m 0644 ${S}/98-usb-gadget-tty.rules ${D}${sysconfdir}/udev/rules.d/
 }

-RDEPENDS_${PN} = "libusbgx"
+RDEPENDS:${PN} = "libusbgx"

--- a/recipes-bsp/tegra-binaries/cboot-prebuilt_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/cboot-prebuilt_32.5.2.bb
@@ -5,8 +5,8 @@ COMPATIBLE_MACHINE = "(tegra)"
 INHIBIT_DEFAULT_DEPS = "1"

 CBOOTBIN_PREBUILT = "cboot.bin"
-CBOOTBIN_PREBUILT_tegra194 = "cboot_t194.bin"
-CBOOTBIN_PREBUILT_tegra210 = "t210ref/cboot.bin"
+CBOOTBIN_PREBUILT:tegra194 = "cboot_t194.bin"
+CBOOTBIN_PREBUILT:tegra210 = "t210ref/cboot.bin"
 PREFERRED_PROVIDER_virtual/bootloader ??= ""
 PROVIDES = "cboot"
 PROVIDES += "${@'virtual/bootloader' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}"
--- a/recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_32.5.2.bb
@@ -41,13 +41,13 @@ do_install() {
 }

 FILES_SOLIBSDEV = ""
-FILES_${PN} = "${libdir}"
-DEBIAN_NOAUTONAME_${PN} = "1"
+FILES:${PN} = "${libdir}"
+DEBIAN_NOAUTONAME:${PN} = "1"

 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INSANE_SKIP_${PN}-nvcompositor = "dev-so ldflags build-deps"
-INSANE_SKIP_${PN} = "dev-so ldflags build-deps"
-RDEPENDS_${PN} = "gstreamer1.0 libgstvideo-1.0 glib-2.0 libegl tegra-libraries libdrm"
-RRECOMMENDS_${PN} = "gstreamer1.0-plugins-nvarguscamerasrc gstreamer1.0-plugins-nvv4l2camerasrc"
+INSANE_SKIP:${PN}-nvcompositor = "dev-so ldflags build-deps"
+INSANE_SKIP:${PN} = "dev-so ldflags build-deps"
+RDEPENDS:${PN} = "gstreamer1.0 libgstvideo-1.0 glib-2.0 libegl tegra-libraries libdrm"
+RRECOMMENDS:${PN} = "gstreamer1.0-plugins-nvarguscamerasrc gstreamer1.0-plugins-nvv4l2camerasrc"
--- a/recipes-bsp/tegra-binaries/libdrm-nvdc_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/libdrm-nvdc_32.5.2.bb
@@ -22,14 +22,14 @@ do_install() {
    install -Dpm 644 tegra.conf ${D}${sysconfdir}/ld.so.conf.d/tegra.conf
 }

-DEBIAN_NOAUTONAME_${PN} = "1"
-DEBIAN_NOAUTONAME_${PN}-dev = "1"
-DEBIAN_NOAUTONAME_${PN}-dbg = "1"
-FILES_${PN} = "${libdir} ${sysconfdir}/ld.so.conf.d"
-FILES_${PN}-dev = ""
+DEBIAN_NOAUTONAME:${PN} = "1"
+DEBIAN_NOAUTONAME:${PN}-dev = "1"
+DEBIAN_NOAUTONAME:${PN}-dbg = "1"
+FILES:${PN} = "${libdir} ${sysconfdir}/ld.so.conf.d"
+FILES:${PN}-dev = ""
 PRIVATE_LIBS = "libdrm.so.2"
-RDEPENDS_${PN} = "tegra-libraries"
-INSANE_SKIP_${PN} = "ldflags dev-so"
+RDEPENDS:${PN} = "tegra-libraries"
+INSANE_SKIP:${PN} = "ldflags dev-so"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
--- a/recipes-bsp/tegra-binaries/nv-tegra-release_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/nv-tegra-release_32.5.2.bb
@@ -19,5 +19,5 @@ do_install() {
    install -m 0644 ${B}/nv_tegra_release ${D}${datadir}/nv_tegra
 }

-FILES_${PN} = "${sysconfdir}"
-FILES_${PN}-dev = "${datadir}/nv_tegra"
+FILES:${PN} = "${sysconfdir}"
+FILES:${PN}-dev = "${datadir}/nv_tegra"
--- a/recipes-bsp/tegra-binaries/tegra-argus-daemon_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-argus-daemon_32.5.2.bb
@@ -23,5 +23,5 @@ inherit systemd update-rc.d

 INITSCRIPT_NAME = "nvargus-daemon"
 INITSCRIPT_PARAMS = "defaults"
-SYSTEMD_SERVICE_${PN} = "nvargus-daemon.service"
-RDEPENDS_${PN} = "tegra-libraries-argus-daemon-base"
+SYSTEMD_SERVICE:${PN} = "nvargus-daemon.service"
+RDEPENDS:${PN} = "tegra-libraries-argus-daemon-base"
--- a/recipes-bsp/tegra-binaries/tegra-binaries-32.5.2.inc
+++ b/recipes-bsp/tegra-binaries/tegra-binaries-32.5.2.inc
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=2cc00be68c1227a7c42ff3620ef75d05
 SRC_URI = "${L4T_URI_BASE}/${L4T_BSP_PREFIX}_Linux_R${L4T_VERSION}_aarch64.tbz2;name=l4t \
 	   ${L4T_ALT_URI_BASE}/secureboot_R${L4T_ALT_VERSION}_aarch64.tbz2;downloadfilename=${L4T_BSP_PREFIX}_secureboot_${L4T_ALT_VERSION}.tbz2;name=sb"
 L4T_SHA256SUM = "308e21bb708c41bada1e349fbe6a1dd9fd7294826edf7aa81073a3ed11fb0c93"
-L4T_SHA256SUM_tegra210 = "6e61a77739fc9184d6eda5aa3de5a0d6b69659a78411cd2d9bcb3a59416bb8cd"
+L4T_SHA256SUM:tegra210 = "6e61a77739fc9184d6eda5aa3de5a0d6b69659a78411cd2d9bcb3a59416bb8cd"
 SRC_URI[l4t.sha256sum] = "${L4T_SHA256SUM}"
 SB_SHA256SUM = "a795ef0e433ac1b3991f5597dd79e15e88d648170edcc25f2f2f3c1dd62c533b"
-SB_SHA256SUM_tegra210 = "0fc525061d203ec2929d985ec711f477cca679cc8e4f0a4a32ca384681811808"
+SB_SHA256SUM:tegra210 = "0fc525061d203ec2929d985ec711f477cca679cc8e4f0a4a32ca384681811808"
 SRC_URI[sb.sha256sum] = "${SB_SHA256SUM}"

 inherit l4t_bsp
--- a/recipes-bsp/tegra-binaries/tegra-bootfiles_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-bootfiles_32.5.2.bb
@@ -13,7 +13,7 @@ SMD_CFG ?= "${S}/bootloader/smd_info.cfg"
 CBOOTOPTION_FILE ?= ""
 ODMFUSE_FILE ?= ""

-BOOTBINS_tegra186 = "\
+BOOTBINS:tegra186 = "\
    adsp-fw.bin \
    bpmp.bin \
    camera-rtcpu-sce.img \
@@ -28,7 +28,7 @@ BOOTBINS_tegra186 = "\
    preboot_d15_prod_cr.bin \
    spe.bin \
 "
-BOOTBINS_tegra194 = "\
+BOOTBINS:tegra194 = "\
    adsp-fw.bin \
    bpmp_t194.bin \
    camera-rtcpu-rce.img \
@@ -47,7 +47,7 @@ BOOTBINS_tegra194 = "\
    warmboot_t194_prod.bin \
 "

-BOOTBINS_tegra210 = "\
+BOOTBINS:tegra210 = "\
    eks.img \
    nvtboot_cpu.bin \
    nvtboot_recovery.bin \
@@ -56,13 +56,13 @@ BOOTBINS_tegra210 = "\
    tos-mon-only.img \
 "

-BOOTBINS_MACHINE_SPECIFIC_tegra186 = "\
+BOOTBINS_MACHINE_SPECIFIC:tegra186 = "\
    nvtboot.bin \
    warmboot.bin \
 "
-BOOTBINS_MACHINE_SPECIFIC_tegra194 = ""
+BOOTBINS_MACHINE_SPECIFIC:tegra194 = ""

-BOOTBINS_MACHINE_SPECIFIC_tegra210 = "\
+BOOTBINS_MACHINE_SPECIFIC:tegra210 = "\
    nvtboot.bin \
    sc7entry-firmware.bin \
    warmboot.bin \
@@ -71,12 +71,12 @@ do_compile() {
    :
 }

-do_compile_append_tegra186() {
+do_compile:append:tegra186() {
    ${STAGING_BINDIR_NATIVE}/tegra186-flash/nv_smd_generator ${SMD_CFG} ${B}/slot_metadata.bin
 }


-do_compile_append_tegra194() {
+do_compile:append:tegra194() {
    ${STAGING_BINDIR_NATIVE}/tegra186-flash/nv_smd_generator ${SMD_CFG} ${B}/slot_metadata.bin
    if [ -n "${CBOOTOPTION_FILE}" ]; then
        dtc -I dts -O dtb -o ${B}/cbo.dtb ${CBOOTOPTION_FILE}
@@ -97,7 +97,7 @@ do_install() {
    [ -z "${ODMFUSE_FILE}" ] || install -m 0644 ${ODMFUSE_FILE} ${D}${datadir}/tegraflash/odmfuse_pkc_${MACHINE}.xml
 }

-do_install_append_tegra186() {
+do_install:append:tegra186() {
    install -m 0644 ${B}/slot_metadata.bin ${D}${datadir}/tegraflash/
    install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/tegra186* ${D}${datadir}/tegraflash/
    install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/tegra186*bpmp*dtb ${D}${datadir}/tegraflash/
@@ -106,12 +106,12 @@ do_install_append_tegra186() {
    install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/emmc.cfg ${D}${datadir}/tegraflash/
 }

-do_install_append_jetson-xavier-nx-devkit-tx2-nx() {
+do_install:append:jetson-xavier-nx-devkit-tx2-nx() {
    # XXX only 16GiB eMMC on tx2-nx
    sed -i -e's,num_sectors="61071360",num_sectors="30777344",' ${D}${datadir}/tegraflash/${PARTITION_LAYOUT_TEMPLATE}
 }

-do_install_append_tegra194() {
+do_install:append:tegra194() {
    install -m 0644 ${B}/slot_metadata.bin ${D}${datadir}/tegraflash/
    install -m 0644 ${BCT_OVERRIDE_TEMPLATE} ${D}${datadir}/tegraflash/${MACHINE}-override.cfg
    install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/tegra19* ${D}${datadir}/tegraflash/
@@ -122,11 +122,11 @@ do_install_append_tegra194() {
    fi
 }

-do_install_append_tegra210() {
+do_install:append:tegra210() {
    [ -z "${NVIDIA_BOARD_CFG}" ] || install -m 0644 ${BOARD_CFG} ${D}${datadir}/tegraflash/board_config_${MACHINE}.xml
 }

 PACKAGES = "${PN}-dev"
-FILES_${PN}-dev = "${datadir}"
-RDEPENDS_${PN}-dev = ""
+FILES:${PN}-dev = "${datadir}"
+RDEPENDS:${PN}-dev = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/tegra-binaries/tegra-brcm-patchram_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-brcm-patchram_32.5.2.bb
@@ -13,4 +13,4 @@ do_install() {
 }

 PACKAGES = "${PN}"
-RDEPENDS_${PN} = "tegra-firmware-brcm"
+RDEPENDS:${PN} = "tegra-firmware-brcm"
--- a/recipes-bsp/tegra-binaries/tegra-configs-alsa_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-configs-alsa_32.5.2.bb
@@ -20,16 +20,16 @@ do_install() {
    install -d ${D}${datadir}/alsa/cards
 }

-do_install_append_tegra186() {
+do_install:append:tegra186() {
    install -m 0644 ${B}/usr/share/alsa/cards/tegra-hda.conf ${D}${datadir}/alsa/cards/
    install -m 0644 ${B}/usr/share/alsa/cards/tegra-snd-t186r.conf ${D}${datadir}/alsa/cards/
 }
-do_install_append_tegra194() {
+do_install:append:tegra194() {
    install -m 0644 ${B}/usr/share/alsa/cards/tegra-hda-galen.conf ${D}${datadir}/alsa/cards/
    install -m 0644 ${B}/usr/share/alsa/cards/tegra-hda-xnx.conf ${D}${datadir}/alsa/cards/
    install -m 0644 ${B}/usr/share/alsa/cards/jetson-xaviernx.conf ${D}${datadir}/alsa/cards/
    install -m 0644 ${B}/usr/share/alsa/cards/tegra-snd-t19x-.conf ${D}${datadir}/alsa/cards/
 }

-FILES_${PN} = "${sysconfdir} ${datadir}/alsa"
+FILES:${PN} = "${sysconfdir} ${datadir}/alsa"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/tegra-binaries/tegra-configs_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-configs_32.5.2.bb
@@ -31,20 +31,20 @@ EOF
    install -m 0644 ${B}/etc/enctune.conf ${D}${sysconfdir}
 }

-do_install_append_tegra186() {
+do_install:append:tegra186() {
    install -m 0644 ${B}/etc/X11/xorg.conf.t186_ref ${D}${sysconfdir}/X11/xorg.conf
 }
-do_install_append_tegra194() {
+do_install:append:tegra194() {
    install -m 0644 ${B}/etc/X11/xorg.conf.t194_ref ${D}${sysconfdir}/X11/xorg.conf
 }
-do_install_append_tegra210() {
+do_install:append:tegra210() {
    install -m 0644 ${B}/etc/X11/xorg.conf ${D}${sysconfdir}/X11/
 }

 PACKAGES = "${PN}-udev ${PN}-omx-tegra ${PN}-xorg ${PN}-nvstartup"
-FILES_${PN}-udev = "${sysconfdir}/udev/rules.d"
-FILES_${PN}-xorg = "${sysconfdir}/X11"
-FILES_${PN}-omx-tegra = "${sysconfdir}/enctune.conf"
-FILES_${PN}-nvstartup = "${sbindir}"
-RDEPENDS_${PN}-udev = "udev"
-RDEPENDS_${PN}-nvstartup = "bash"
+FILES:${PN}-udev = "${sysconfdir}/udev/rules.d"
+FILES:${PN}-xorg = "${sysconfdir}/X11"
+FILES:${PN}-omx-tegra = "${sysconfdir}/enctune.conf"
+FILES:${PN}-nvstartup = "${sbindir}"
+RDEPENDS:${PN}-udev = "udev"
+RDEPENDS:${PN}-nvstartup = "bash"
--- a/recipes-bsp/tegra-binaries/tegra-firmware_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-firmware_32.5.2.bb
@@ -16,7 +16,7 @@ do_install() {
    cp -R -f ${B}/lib/firmware ${D}${nonarch_base_libdir}
 }

-do_install_append_tegra210() {
+do_install:append:tegra210() {
    GPUFWDIR="${D}${nonarch_base_libdir}/firmware/gm20b"
    install -d "$GPUFWDIR"
    for f in acr_ucode.bin fecs.bin fecs_sig.bin gpccs.bin gpmu_ucode.bin \
@@ -28,29 +28,29 @@ do_install_append_tegra210() {
 }

 PACKAGES = "${PN}-rtl8822 ${PN}-brcm ${PN}-tegra186-xusb ${PN}-tegra194-xusb ${PN}-tegra210-xusb ${PN}-tegra186 ${PN}-tegra194 ${PN}-tegra210 ${PN}-xusb ${PN}"
-FILES_${PN}-brcm = "${nonarch_base_libdir}/firmware/brcm ${nonarch_base_libdir}/firmware/bcm4354.hcd ${nonarch_base_libdir}/firmware/nv-*-Version"
-FILES_${PN}-rtl8822 = "${nonarch_base_libdir}/firmware/rtl8822*"
-FILES_${PN}-tegra186-xusb = "${nonarch_base_libdir}/firmware/tegra18x_xusb_firmware"
-FILES_${PN}-tegra194-xusb = "${nonarch_base_libdir}/firmware/tegra19x_xusb_firmware"
-FILES_${PN}-tegra210-xusb = "${nonarch_base_libdir}/firmware/tegra21x_xusb_firmware"
-FILES_${PN}-tegra186 = "${nonarch_base_libdir}/firmware/tegra18x ${nonarch_base_libdir}/firmware/gp10b"
-FILES_${PN}-tegra194 = "${nonarch_base_libdir}/firmware/tegra19x ${nonarch_base_libdir}/firmware/gv11b"
-FILES_${PN}-tegra210 = "${nonarch_base_libdir}/firmware/tegra21x ${nonarch_base_libdir}/firmware/gm20b ${nonarch_base_libdir}/firmware/adsp.elf"
-INSANE_SKIP_${PN}-tegra210 = "arch"
-FILES_${PN}-xusb = ""
-ALLOW_EMPTY_${PN}-xusb = "1"
-FILES_${PN} = ""
-ALLOW_EMPTY_${PN} = "1"
+FILES:${PN}-brcm = "${nonarch_base_libdir}/firmware/brcm ${nonarch_base_libdir}/firmware/bcm4354.hcd ${nonarch_base_libdir}/firmware/nv-*-Version"
+FILES:${PN}-rtl8822 = "${nonarch_base_libdir}/firmware/rtl8822*"
+FILES:${PN}-tegra186-xusb = "${nonarch_base_libdir}/firmware/tegra18x_xusb_firmware"
+FILES:${PN}-tegra194-xusb = "${nonarch_base_libdir}/firmware/tegra19x_xusb_firmware"
+FILES:${PN}-tegra210-xusb = "${nonarch_base_libdir}/firmware/tegra21x_xusb_firmware"
+FILES:${PN}-tegra186 = "${nonarch_base_libdir}/firmware/tegra18x ${nonarch_base_libdir}/firmware/gp10b"
+FILES:${PN}-tegra194 = "${nonarch_base_libdir}/firmware/tegra19x ${nonarch_base_libdir}/firmware/gv11b"
+FILES:${PN}-tegra210 = "${nonarch_base_libdir}/firmware/tegra21x ${nonarch_base_libdir}/firmware/gm20b ${nonarch_base_libdir}/firmware/adsp.elf"
+INSANE_SKIP:${PN}-tegra210 = "arch"
+FILES:${PN}-xusb = ""
+ALLOW_EMPTY:${PN}-xusb = "1"
+FILES:${PN} = ""
+ALLOW_EMPTY:${PN} = "1"
 XUSBDEPS = ""
-XUSBDEPS_tegra186 = "${PN}-tegra186-xusb"
-XUSBDEPS_tegra194 = "${PN}-tegra194-xusb"
-XUSBDEPS_tegra210 = "${PN}-tegra210-xusb"
-RDEPENDS_${PN}-xusb = "${XUSBDEPS}"
+XUSBDEPS:tegra186 = "${PN}-tegra186-xusb"
+XUSBDEPS:tegra194 = "${PN}-tegra194-xusb"
+XUSBDEPS:tegra210 = "${PN}-tegra210-xusb"
+RDEPENDS:${PN}-xusb = "${XUSBDEPS}"
 FWDEPS = ""
-FWDEPS_tegra186 = "${PN}-tegra186"
-FWDEPS_tegra194 = "${PN}-tegra194"
-FWDEPS_tegra210 = "${PN}-tegra210"
-RDEPENDS_${PN} = "${FWDEPS} ${PN}-xusb"
+FWDEPS:tegra186 = "${PN}-tegra186"
+FWDEPS:tegra194 = "${PN}-tegra194"
+FWDEPS:tegra210 = "${PN}-tegra210"
+RDEPENDS:${PN} = "${FWDEPS} ${PN}-xusb"

 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
--- a/recipes-bsp/tegra-binaries/tegra-flashvars_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-flashvars_32.5.2.bb
@@ -18,5 +18,5 @@ do_install() {
    install -m 0644 ${S}/flashvars ${D}${datadir}/tegraflash/
 }

-FILES_${PN} = "${datadir}/tegraflash"
+FILES:${PN} = "${datadir}/tegraflash"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/tegra-binaries/tegra-libraries_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-libraries_32.5.2.bb
@@ -76,7 +76,7 @@ do_install() {
    rm ${D}${libdir}/libnvidia-egl-wayland*
 }

-pkg_postinst_${PN}() {
+pkg_postinst:${PN}() {
    # argus and scf libraries hard-coded to use this path
    install -d $D/usr/lib/aarch64-linux-gnu/tegra-egl
    ln $D${libdir}/libEGL_nvidia.so.0 $D/usr/lib/aarch64-linux-gnu/tegra-egl/
@@ -84,25 +84,25 @@ pkg_postinst_${PN}() {

 PACKAGES = "${PN}-libv4l-plugins ${PN}-argus ${PN}-argus-daemon-base ${PN}-libnvosd ${PN}-dev ${PN}"

-FILES_${PN}-libv4l-plugins = "${libdir}/libv4l"
-FILES_${PN}-argus = "${libdir}/libnvargus*"
-FILES_${PN}-argus-daemon-base = "${sbindir}/nvargus-daemon"
-FILES_${PN}-libnvosd = "${libdir}/libnvosd*"
-FILES_${PN} = "${libdir} ${sbindir} ${nonarch_libdir} ${localstatedir} ${sysconfdir} ${datadir} \
+FILES:${PN}-libv4l-plugins = "${libdir}/libv4l"
+FILES:${PN}-argus = "${libdir}/libnvargus*"
+FILES:${PN}-argus-daemon-base = "${sbindir}/nvargus-daemon"
+FILES:${PN}-libnvosd = "${libdir}/libnvosd*"
+FILES:${PN} = "${libdir} ${sbindir} ${nonarch_libdir} ${localstatedir} ${sysconfdir} ${datadir} \
               /usr/lib/aarch64-linux-gnu/tegra/nvidia_icd.json"
-FILES_${PN}-dev = "${libdir}/lib*GL*.so"
-RDEPENDS_${PN} = "libasound"
-RDEPENDS_${PN}-argus = "tegra-argus-daemon"
-RDEPENDS_${PN}-argus-daemon-base = "${PN} libglvnd"
-RDEPENDS_${PN}-libnvosd = "${PN} pango cairo glib-2.0"
-RRECOMMENDS_${PN}-libnvosd = "liberation-fonts"
-RRECOMMENDS_${PN} = "kernel-module-nvgpu"
+FILES:${PN}-dev = "${libdir}/lib*GL*.so"
+RDEPENDS:${PN} = "libasound"
+RDEPENDS:${PN}-argus = "tegra-argus-daemon"
+RDEPENDS:${PN}-argus-daemon-base = "${PN} libglvnd"
+RDEPENDS:${PN}-libnvosd = "${PN} pango cairo glib-2.0"
+RRECOMMENDS:${PN}-libnvosd = "liberation-fonts"
+RRECOMMENDS:${PN} = "kernel-module-nvgpu"

-INSANE_SKIP_${PN}-libv4l-plugins = "dev-so textrel ldflags build-deps"
-INSANE_SKIP_${PN} = "dev-so textrel ldflags build-deps libdir"
-INSANE_SKIP_${PN}-argus = "dev-so ldflags"
-INSANE_SKIP_${PN}-argus-daemon-base = "ldflags"
-INSANE_SKIP_${PN}-libnvosd = "dev-so ldflags"
+INSANE_SKIP:${PN}-libv4l-plugins = "dev-so textrel ldflags build-deps"
+INSANE_SKIP:${PN} = "dev-so textrel ldflags build-deps libdir"
+INSANE_SKIP:${PN}-argus = "dev-so ldflags"
+INSANE_SKIP:${PN}-argus-daemon-base = "ldflags"
+INSANE_SKIP:${PN}-libnvosd = "dev-so ldflags"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
--- a/recipes-bsp/tegra-binaries/tegra-nvphs-base_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvphs-base_32.5.2.bb
@@ -7,8 +7,8 @@ inherit container-runtime-csv

 COMPATIBLE_MACHINE = "(tegra)"
 NVPHSD_MACHINE_CONF = "nvphsd.conf"
-NVPHSD_MACHINE_CONF_tegra186 = "nvphsd.conf.t186"
-NVPHSD_MACHINE_CONF_tegra194 = "nvphsd.conf.t194"
+NVPHSD_MACHINE_CONF:tegra186 = "nvphsd.conf.t186"
+NVPHSD_MACHINE_CONF:tegra194 = "nvphsd.conf.t194"

 do_configure() {
    tar -C ${B} -x -f ${S}/nv_tegra/nvidia_drivers.tbz2 usr/sbin/nvphsd usr/lib/aarch64-linux-gnu/tegra
@@ -27,9 +27,9 @@ do_install() {
 }

 PACKAGES = "${PN}"
-FILES_${PN} = "${sbindir} ${sysconfdir} ${libdir}"
-RDEPENDS_${PN} = "bash tegra-libraries"
-INSANE_SKIP_${PN} = "ldflags dev-so"
+FILES:${PN} = "${sbindir} ${sysconfdir} ${libdir}"
+RDEPENDS:${PN} = "bash tegra-libraries"
+INSANE_SKIP:${PN} = "ldflags dev-so"
 INHIBIT_SYSROOT_STRIP = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
--- a/recipes-bsp/tegra-binaries/tegra-nvphs_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvphs_32.5.2.bb
@@ -23,6 +23,6 @@ inherit systemd update-rc.d

 INITSCRIPT_NAME = "nvphs"
 INITSCRIPT_PARAMS = "defaults"
-SYSTEMD_SERVICE_${PN} = "nvphs.service"
+SYSTEMD_SERVICE:${PN} = "nvphs.service"

-RDEPENDS_${PN} = "tegra-nvphs-base"
+RDEPENDS:${PN} = "tegra-nvphs-base"
--- a/recipes-bsp/tegra-binaries/tegra-nvpmodel-base_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvpmodel-base_32.5.2.bb
@@ -24,7 +24,7 @@ do_install() {
    fi
 }

-FILES_${PN} = "${sbindir}/nvpmodel ${sysconfdir}"
-INSANE_SKIP_${PN} = "ldflags"
+FILES:${PN} = "${sbindir}/nvpmodel ${sysconfdir}"
+INSANE_SKIP:${PN} = "ldflags"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.5.2.bb
@@ -23,5 +23,5 @@ inherit systemd update-rc.d

 INITSCRIPT_NAME = "nvpmodel"
 INITSCRIPT_PARAMS = "defaults"
-SYSTEMD_SERVICE_${PN} = "nvpmodel.service"
-RDEPENDS_${PN} = "tegra-nvpmodel-base"
+SYSTEMD_SERVICE:${PN} = "nvpmodel.service"
+RDEPENDS:${PN} = "tegra-nvpmodel-base"
--- a/recipes-bsp/tegra-binaries/tegra-nvs-base_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvs-base_32.5.2.bb
@@ -17,6 +17,6 @@ do_install() {
 }

 PACKAGES = "${PN}"
-FILES_${PN} = "${sbindir} ${sysconfdir}"
-RDEPENDS_${PN} = "bash tegra-libraries"
-INSANE_SKIP_${PN} = "ldflags"
+FILES:${PN} = "${sbindir} ${sysconfdir}"
+RDEPENDS:${PN} = "bash tegra-libraries"
+INSANE_SKIP:${PN} = "ldflags"
--- a/recipes-bsp/tegra-binaries/tegra-nvs-service_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvs-service_32.5.2.bb
@@ -23,7 +23,7 @@ inherit systemd update-rc.d

 INITSCRIPT_NAME = "nvs-service"
 INITSCRIPT_PARAMS = "defaults"
-SYSTEMD_SERVICE_${PN} = "nvs-service.service"
-RDEPENDS_${PN} = "tegra-nvs-base"
+SYSTEMD_SERVICE:${PN} = "nvs-service.service"
+RDEPENDS:${PN} = "tegra-nvs-base"

 PACKAGE_ARCH = "${TEGRA_PKGARCH}"
--- a/recipes-bsp/tegra-binaries/tegra-nvstartup_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvstartup_32.5.2.bb
@@ -22,5 +22,5 @@ inherit systemd update-rc.d

 INITSCRIPT_NAME = "nvstartup"
 INITSCRIPT_PARAMS = "defaults 00"
-SYSTEMD_SERVICE_${PN} = "nvstartup.service"
-RDEPENDS_${PN} = "tegra-configs-nvstartup"
+SYSTEMD_SERVICE:${PN} = "nvstartup.service"
+RDEPENDS:${PN} = "tegra-configs-nvstartup"
--- a/recipes-bsp/tegra-binaries/tegra-redundant-boot-base_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-redundant-boot-base_32.5.2.bb
@@ -12,7 +12,7 @@ do_configure() {
        tar -C ${B} -x -f ${S}/nv_tegra/config.tbz2 etc
 }

-do_configure_append_tegra210() {
+do_configure:append:tegra210() {
 	quilt import ${STAGING_DATADIR}/l4t-patches-${PV}/Convert-l4t_payload_updater_t210-to-Python3.patch
        quilt push
 }
@@ -29,7 +29,7 @@ do_install() {
 	install -d ${D}/opt/ota_package
 }

-do_install_tegra210() {
+do_install:tegra210() {
 	install -d ${D}${sbindir}
 	install -m 0755 ${B}/usr/sbin/l4t_payload_updater_t210 ${D}${sbindir}
 	install -d ${D}/opt/ota_package
@@ -39,12 +39,12 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 PACKAGES = "tegra-redundant-boot-nvbootctrl ${PN} ${PN}-dev"
-FILES_tegra-redundant-boot-nvbootctrl = "${sbindir}/nvbootctrl"
-FILES_${PN} += "/opt/ota_package"
-RDEPENDS_${PN} = "tegra-redundant-boot-nvbootctrl setup-nv-boot-control-service"
-RDEPENDS_${PN}_tegra210 = "setup-nv-boot-control-service python3-core"
-INSANE_SKIP_${PN} = "ldflags"
-RDEPENDS_tegra-redundant-boot-nvbootctrl = "setup-nv-boot-control"
-RDEPENDS_tegra-redundant-boot-nvbootctrl_tegra210 = ""
-ALLOW_EMPTY_tegra-redundant-boot-nvbootctrl_tegra210 = "1"
-INSANE_SKIP_tegra-redundant-boot-nvbootctrl = "ldflags"
+FILES:tegra-redundant-boot-nvbootctrl = "${sbindir}/nvbootctrl"
+FILES:${PN} += "/opt/ota_package"
+RDEPENDS:${PN} = "tegra-redundant-boot-nvbootctrl setup-nv-boot-control-service"
+RDEPENDS:${PN:}:tegra210 = "setup-nv-boot-control-service python3-core"
+INSANE_SKIP:${PN} = "ldflags"
+RDEPENDS:tegra-redundant-boot-nvbootctrl = "setup-nv-boot-control"
+RDEPENDS:tegra-redundant-boot-nvbootctrl:tegra210 = ""
+ALLOW_EMPTY:tegra-redundant-boot-nvbootctrl:tegra210 = "1"
+INSANE_SKIP:tegra-redundant-boot-nvbootctrl = "ldflags"
--- a/recipes-bsp/tegra-binaries/tegra-redundant-boot-rollback_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-redundant-boot-rollback_32.5.2.bb
@@ -18,12 +18,12 @@ do_install() {
 	:
 }

-do_install_append_tegra186() {
+do_install:append:tegra186() {
 	install -d ${D}${datadir}/nv_tegra/rollback/t18x
 	install -m 0644 ${S}/bootloader/rollback/t18x/rollback.cfg ${D}${datadir}/nv_tegra/rollback/t18x/
 }

-do_install_append_tegra194() {
+do_install:append:tegra194() {
 	install -d ${D}${datadir}/nv_tegra/rollback/t19x
 	install -m 0644 ${S}/bootloader/rollback/t19x/rollback.cfg ${D}${datadir}/nv_tegra/rollback/t19x/
 }
--- a/recipes-bsp/tegra-binaries/tegra-redundant-boot_32.5.2.bb
+++ b/recipes-bsp/tegra-binaries/tegra-redundant-boot_32.5.2.bb
@@ -20,18 +20,18 @@ do_install() {
    install -m 0644 ${S}/nv_update_verifier.service ${D}${systemd_system_unitdir}
 }

-do_install_tegra210() {
+do_install:tegra210() {
    :
 }

 inherit update-rc.d systemd

-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_PACKAGES_tegra210 = ""
+INITSCRIPT_PACKAGES:tegra210 = ""
 INITSCRIPT_NAME = "nv_update_verifier"
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_PACKAGES_tegra210 = ""
-SYSTEMD_SERVICE_${PN} = "nv_update_verifier.service"
-RDEPENDS_${PN} = "tegra-redundant-boot-base"
+SYSTEMD_PACKAGES:tegra210 = ""
+SYSTEMD_SERVICE:${PN} = "nv_update_verifier.service"
+RDEPENDS:${PN} = "tegra-redundant-boot-base"
 PACKAGE_ARCH = "${L4T_BSP_PKGARCH}"
--- a/Show More
+++ b/Show More