meta-linaro: convert overrides syntax

Convert overrides syntax to new format using
./scripts/contrib/convert-overrides.py version 0.9.1 with the following
manual tweaks:

- do not change syntax in meta-aarch64/conf/layer.conf, it does not use
  overrides, but rather variables specific to the layer (named aarch64,
  should probably be renamed to meta-aarch64 to remove confusion).

- do not change ld_append_if_tune_exists function name

- do not change argz_append in
  meta-ilp32/recipes-overlayed/glibc/site_config/funcs

- do not change CROSS_COMPILE_ta_arm64 in EXTRA_OEMAKE value in
  meta-optee/recipes-security/optee/optee-os_git.bb

Change-Id: I9225332eb68376cc8b5467df7cbc8b63039a22b8
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

74 files changed, 298 insertions, 298 deletions

diff --git a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
index f251e14a..8318d1f9 100644
--- a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
+++ b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
@@ -107,7 +107,7 @@ PACKAGES = " \
 	    ${JDKPN}-jre \
 	   "
 
-FILES_${JDKPN}-jdk = " \
+FILES:${JDKPN}-jdk = " \
 		       ${JDK_HOME}/bin \
 		       ${JDK_HOME}/lib \
 		       ${JDK_HOME}/include \
@@ -117,40 +117,40 @@ FILES_${JDKPN}-jdk = " \
 		       ${JDK_HOME}/LICENSE \
 		      "
 
-FILES_${JDKPN}-doc = " \
+FILES:${JDKPN}-doc = " \
 		       ${JDK_HOME}/man \
 		      "
 
-FILES_${JDKPN}-source = " \
+FILES:${JDKPN}-source = " \
 		          ${JDK_HOME}/src.zip \
 			"
 
-FILES_${JDKPN}-demo = " \
+FILES:${JDKPN}-demo = " \
 		        ${JDK_HOME}/demo \
                         ${JDK_HOME}/sample \
                       "
 
-FILES_${JDKPN}-jtreg = " \
+FILES:${JDKPN}-jtreg = " \
                          ${JDK_HOME}/jtreg \
                       "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
 	        ${JDK_HOME}/jre \
               "
 
-INSANE_SKIP_${JDKPN}-jdk = "dev-so"
-INSANE_SKIP_${JDKPN}-jre = "dev-so"
+INSANE_SKIP:${JDKPN}-jdk = "dev-so"
+INSANE_SKIP:${JDKPN}-jre = "dev-so"
 
-RPROVIDES_${JDKPN}-jre = "java2-runtime java2-vm"
-RPROVIDES_${JDKPN}-jdk = "java2-runtime java2-vm"
-RDEPENDS_${JDKPN}-demo = "java2-runtime"
+RPROVIDES:${JDKPN}-jre = "java2-runtime java2-vm"
+RPROVIDES:${JDKPN}-jdk = "java2-runtime java2-vm"
+RDEPENDS:${JDKPN}-demo = "java2-runtime"
 
-RRECOMMENDS_${JDKPN}-jre = "liberation-fonts"
-RRECOMMENDS_${JDKPN}-jdk = "liberation-fonts"
+RRECOMMENDS:${JDKPN}-jre = "liberation-fonts"
+RRECOMMENDS:${JDKPN}-jdk = "liberation-fonts"
 
 inherit update-alternatives
 
-pkg_postinst_${JDKPN}-jre () {
+pkg_postinst:${JDKPN}-jre () {
     update-alternatives --install ${bindir}/java java ${JDK_HOME}/jre/bin/java 75
     update-alternatives --install ${bindir}/jjs jjs ${JDK_HOME}/jre/bin/jjs 75
     update-alternatives --install ${bindir}/keytool keytool ${JDK_HOME}/jre/bin/keytool 75
@@ -164,7 +164,7 @@ pkg_postinst_${JDKPN}-jre () {
     update-alternatives --install ${bindir}/unpack200 unpack200 ${JDK_HOME}/jre/bin/unpack200 75
 }
 
-pkg_prerm_${JDKPN}-jre () {
+pkg_prerm:${JDKPN}-jre () {
     update-alternatives --remove java ${JDK_HOME}/jre/bin/java
     update-alternatives --remove jjs ${JDK_HOME}/jre/bin/jjs
     update-alternatives --remove keytool ${JDK_HOME}/jre/bin/keytool
@@ -178,7 +178,7 @@ pkg_prerm_${JDKPN}-jre () {
     update-alternatives --remove unpack200 ${JDK_HOME}/jre/bin/unpack200
 }
 
-pkg_postinst_${JDKPN}-jdk () {
+pkg_postinst:${JDKPN}-jdk () {
     update-alternatives --install ${bindir}/appletviewer appletviewer ${JDK_HOME}/bin/appletviewer 100
     update-alternatives --install ${bindir}/extcheck extcheck ${JDK_HOME}/bin/extcheck 100
     update-alternatives --install ${bindir}/idlj idlj ${JDK_HOME}/bin/idlj 100
@@ -222,7 +222,7 @@ pkg_postinst_${JDKPN}-jdk () {
     update-alternatives --install ${bindir}/xjc xjc ${JDK_HOME}/bin/xjc 100
 }
 
-pkg_prerm_${JDKPN}-jdk () {
+pkg_prerm:${JDKPN}-jdk () {
     update-alternatives --remove appletviewer ${JDK_HOME}/bin/appletviewer
     update-alternatives --remove extcheck ${JDK_HOME}/bin/extcheck
     update-alternatives --remove idlj ${JDK_HOME}/bin/idlj
diff --git a/meta-bigendian/recipes-devtools/strace/strace_%.bbappend b/meta-bigendian/recipes-devtools/strace/strace_%.bbappend
index 3f3d73e0..42506960 100644
--- a/meta-bigendian/recipes-devtools/strace/strace_%.bbappend
+++ b/meta-bigendian/recipes-devtools/strace/strace_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://strace-4.8-arm-be8.patch"
diff --git a/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend b/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend
index 05b2f117..a1683a2d 100644
--- a/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend
+++ b/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://libffi_armeb_be8.patch"
diff --git a/meta-bigendian/recipes-kernel/sysprof/sysprof_git.bbappend b/meta-bigendian/recipes-kernel/sysprof/sysprof_git.bbappend
index 3a9227f8..6d940fb7 100644
--- a/meta-bigendian/recipes-kernel/sysprof/sysprof_git.bbappend
+++ b/meta-bigendian/recipes-kernel/sysprof/sysprof_git.bbappend
@@ -1 +1 @@
-SRC_URI_append_armeb  = " file://rmb-arm.patch"
+SRC_URI:append:armeb  = " file://rmb-arm.patch"
diff --git a/meta-ilp32/conf/machine/genericarmv8-ilp32.conf b/meta-ilp32/conf/machine/genericarmv8-ilp32.conf
index 997f557d..39bed286 100644
--- a/meta-ilp32/conf/machine/genericarmv8-ilp32.conf
+++ b/meta-ilp32/conf/machine/genericarmv8-ilp32.conf
@@ -39,6 +39,6 @@ FEATURE_PACKAGES_autoserial = "auto-serial-console"
 # auto-serial-console there
 USE_VT = "0"
 
-IMAGE_FSTYPES_append = " ext4.gz"
+IMAGE_FSTYPES:append = " ext4.gz"
 IMAGE_ROOTFS_ALIGNMENT = "4096"
-EXTRA_IMAGECMD_ext4 += " -L rootfs "
+EXTRA_IMAGECMD:ext4 += " -L rootfs "
diff --git a/meta-ilp32/conf/machine/hikey-ilp32.conf b/meta-ilp32/conf/machine/hikey-ilp32.conf
index 2ef49806..c92fccd2 100644
--- a/meta-ilp32/conf/machine/hikey-ilp32.conf
+++ b/meta-ilp32/conf/machine/hikey-ilp32.conf
@@ -43,11 +43,11 @@ FEATURE_PACKAGES_autoserial = "auto-serial-console"
 # auto-serial-console there
 USE_VT = "0"
 
-IMAGE_FSTYPES_append = " ext4.gz"
+IMAGE_FSTYPES:append = " ext4.gz"
 IMAGE_ROOTFS_ALIGNMENT = "4096"
-EXTRA_IMAGECMD_ext4 += " -L rootfs "
+EXTRA_IMAGECMD:ext4 += " -L rootfs "
 
-IMAGE_INSTALL_append = " kernel-image"
+IMAGE_INSTALL:append = " kernel-image"
 
 CMDLINE ?= "console=ttyAMA3,115200n8 root=/dev/mmcblk0p9 rootwait rw quiet efi=noruntime"
 
diff --git a/meta-ilp32/conf/machine/include/arm64/arch-armv8.inc b/meta-ilp32/conf/machine/include/arm64/arch-armv8.inc
index b0daafc1..9bbe448a 100644
--- a/meta-ilp32/conf/machine/include/arm64/arch-armv8.inc
+++ b/meta-ilp32/conf/machine/include/arm64/arch-armv8.inc
@@ -15,10 +15,10 @@ MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "ilp32", ":aarchilp32
 
 # Little Endian base configs
 AVAILTUNES += "aarch64 aarch64_be aarch64_ilp32 aarch64_be_ilp32"
-TUNE_FEATURES_tune-aarch64 ?= "aarch64"
-TUNE_FEATURES_tune-aarch64_be ?= "${TUNE_FEATURES_tune-aarch64} bigendian"
-TUNE_FEATURES_tune-aarch64_ilp32 ?= "aarch64 ilp32"
-TUNE_FEATURES_tune-aarch64_be_ilp32 ?= "${TUNE_FEATURES_tune-aarch64} bigendian ilp32"
+TUNE_FEATURES:tune-aarch64 ?= "aarch64"
+TUNE_FEATURES:tune-aarch64_be ?= "${TUNE_FEATURES:tune-aarch64} bigendian"
+TUNE_FEATURES:tune-aarch64_ilp32 ?= "aarch64 ilp32"
+TUNE_FEATURES:tune-aarch64_be_ilp32 ?= "${TUNE_FEATURES:tune-aarch64} bigendian ilp32"
 
 ARMPKGSFX_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "_be", "", d)}"
 ARMPKGSFX_ILP32 = "${@bb.utils.contains("TUNE_FEATURES", "ilp32", "_ilp32", "", d)}"
diff --git a/meta-ilp32/recipes-overlayed/edk2-hikey/edk2-hikey_git.bbappend b/meta-ilp32/recipes-overlayed/edk2-hikey/edk2-hikey_git.bbappend
index 89c020f2..ad055e56 100644
--- a/meta-ilp32/recipes-overlayed/edk2-hikey/edk2-hikey_git.bbappend
+++ b/meta-ilp32/recipes-overlayed/edk2-hikey/edk2-hikey_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE = "hikey|hikey-ilp32"
 
@@ -9,6 +9,6 @@ SRC_URI += "file://0001-set-flag-to-build-in-lp64-mode-for-ilp32-toolchain.patch
     file://grub.cfg.ilp32 \
 "
 
-do_install_prepend() {
+do_install:prepend() {
     cp -a ${WORKDIR}/grub.cfg.ilp32 ${WORKDIR}/grub.cfg.in
 }
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-collateral.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-collateral.inc
index de859d5c..bc8ac451 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-collateral.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-collateral.inc
@@ -17,5 +17,5 @@ do_compile[noexec] = "1"
 
 do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale"
 
-COMPATIBLE_HOST_libc-musl_class-target = "null"
+COMPATIBLE_HOST:libc-musl:class-target = "null"
 
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-initial.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-initial.inc
index ac48d914..ec71f9e5 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-initial.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-initial.inc
@@ -5,7 +5,7 @@ PACKAGES = ""
 PACKAGES_DYNAMIC = ""
 
 STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
-STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
+STAGINGCC:class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
 
 do_configure () {
 	cd ${S}/sysdeps/unix/sysv/linux/aarch64; autoconf -I../../../../..;cd -
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-ld.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-ld.inc
index c1d635dc..0a0cae6d 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-ld.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-ld.inc
@@ -44,5 +44,5 @@ def glibc_dl_info(d):
 
 EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}"
 RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}"
-RTLDLIST_class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}"
+RTLDLIST:class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}"
 glibc_dl_info[vardepsexclude] = "OVERRIDES"
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-locale.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-locale.inc
index 75ababea..532b7942 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-locale.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-locale.inc
@@ -9,12 +9,12 @@ LOCALEBASEPN = "${MLPREFIX}glibc"
 # ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so')
 # ERROR: Function failed: split_and_strip_files
 BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
-BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
+BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
 do_package[depends] += "${BINUTILSDEP}"
 
 # localedef links with libc.so and glibc-collateral.incinhibits all default deps
 # cannot add virtual/libc to DEPENDS, because it would conflict with libc-initial in RSS
-RDEPENDS_localedef += "glibc"
+RDEPENDS:localedef += "glibc"
 
 # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
 # is set. The idea is to avoid running localedef on the target (at first boot)
@@ -23,7 +23,7 @@ RDEPENDS_localedef += "glibc"
 
 # default to disabled 
 ENABLE_BINARY_LOCALE_GENERATION ?= "0"
-ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-glibc-locale = "1"
+ENABLE_BINARY_LOCALE_GENERATION:pn-nativesdk-glibc-locale = "1"
 
 #enable locale generation on these arches
 # BINARY_LOCALE_ARCHES is a space separated list of regular expressions
@@ -43,32 +43,32 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
                     ^${MLPREFIX}glibc-gconv$"
 
 # Create a glibc-binaries package
-ALLOW_EMPTY_${BPN}-binaries = "1"
+ALLOW_EMPTY:${BPN}-binaries = "1"
 PACKAGES += "${BPN}-binaries"
-RRECOMMENDS_${BPN}-binaries =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}"
+RRECOMMENDS:${BPN}-binaries =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}"
 
 # Create a glibc-charmaps package
-ALLOW_EMPTY_${BPN}-charmaps = "1"
+ALLOW_EMPTY:${BPN}-charmaps = "1"
 PACKAGES += "${BPN}-charmaps"
-RRECOMMENDS_${BPN}-charmaps =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}"
+RRECOMMENDS:${BPN}-charmaps =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}"
 
 # Create a glibc-gconvs package
-ALLOW_EMPTY_${BPN}-gconvs = "1"
+ALLOW_EMPTY:${BPN}-gconvs = "1"
 PACKAGES += "${BPN}-gconvs"
-RRECOMMENDS_${BPN}-gconvs =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}"
+RRECOMMENDS:${BPN}-gconvs =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}"
 
 # Create a glibc-localedatas package
-ALLOW_EMPTY_${BPN}-localedatas = "1"
+ALLOW_EMPTY:${BPN}-localedatas = "1"
 PACKAGES += "${BPN}-localedatas"
-RRECOMMENDS_${BPN}-localedatas =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}"
+RRECOMMENDS:${BPN}-localedatas =  "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}"
 
-DESCRIPTION_localedef = "glibc: compile locale definition files"
+DESCRIPTION:localedef = "glibc: compile locale definition files"
 
 # glibc-gconv is dynamically added into PACKAGES, thus
-# FILES_glibc-gconv will not be automatically extended in multilib.
-# Explicitly add ${MLPREFIX} for FILES_glibc-gconv.
-FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*"
-FILES_localedef = "${bindir}/localedef"
+# FILES:glibc-gconv will not be automatically extended in multilib.
+# Explicitly add ${MLPREFIX} for FILES:glibc-gconv.
+FILES:${MLPREFIX}glibc-gconv = "${libdir}/gconv/*"
+FILES:localedef = "${bindir}/localedef"
 
 LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
 
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-mtrace.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-mtrace.inc
index d703c14b..20a35a84 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-mtrace.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-mtrace.inc
@@ -2,8 +2,8 @@ require glibc-collateral.inc
 
 SUMMARY = "mtrace utility provided by glibc"
 DESCRIPTION = "mtrace utility provided by glibc"
-RDEPENDS_${PN} = "perl"
-RPROVIDES_${PN} = "libc-mtrace"
+RDEPENDS:${PN} = "perl"
+RPROVIDES:${PN} = "libc-mtrace"
 
 SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
 
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-package.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-package.inc
index df3db2cc..26a40159 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-package.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-package.inc
@@ -3,61 +3,61 @@ INHIBIT_SYSROOT_STRIP = "1"
 PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
 
 # The ld.so in this glibc supports the GNU_HASH
-RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"
-RPROVIDES_${PN}-utils = "eglibc-utils"
-RPROVIDES_${PN}-mtrace = "eglibc-mtrace libc-mtrace"
-RPROVIDES_${PN}-pic = "eglibc-pic"
-RPROVIDES_${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev"
-RPROVIDES_${PN}-staticdev = "eglibc-staticdev"
-RPROVIDES_${PN}-doc = "eglibc-doc"
-RPROVIDES_glibc-extra-nss = "eglibc-extra-nss"
-RPROVIDES_glibc-thread-db = "eglibc-thread-db"
-RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile"
-RPROVIDES_${PN}-dbg = "eglibc-dbg"
+RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)"
+RPROVIDES:${PN}-utils = "eglibc-utils"
+RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace"
+RPROVIDES:${PN}-pic = "eglibc-pic"
+RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev"
+RPROVIDES:${PN}-staticdev = "eglibc-staticdev"
+RPROVIDES:${PN}-doc = "eglibc-doc"
+RPROVIDES:glibc-extra-nss = "eglibc-extra-nss"
+RPROVIDES:glibc-thread-db = "eglibc-thread-db"
+RPROVIDES:${PN}-pcprofile = "eglibc-pcprofile"
+RPROVIDES:${PN}-dbg = "eglibc-dbg"
 libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
-libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1"
-INSANE_SKIP_${PN}_append_aarch64 = " libdir"
-
-FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
-FILES_ldd = "${bindir}/ldd"
-FILES_libsegfault = "${base_libdir}/libSegFault*"
-FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
-FILES_libmemusage = "${base_libdir}/libmemusage.so"
-FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
-FILES_sln = "${base_sbindir}/sln"
-FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
-FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
+libc_baselibs:append:aarch64 = " /lib/ld-linux-aarch64*.so.1"
+INSANE_SKIP:${PN}:append:aarch64 = " libdir"
+
+FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf"
+FILES:ldd = "${bindir}/ldd"
+FILES:libsegfault = "${base_libdir}/libSegFault*"
+FILES:libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
+FILES:libmemusage = "${base_libdir}/libmemusage.so"
+FILES:glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
+FILES:sln = "${base_sbindir}/sln"
+FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
+FILES:libsotruss = "${libdir}/audit/sotruss-lib.so"
 FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
-FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
-FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
-FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
+FILES:${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
+FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
               ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd"
-FILES_${PN}-mtrace = "${bindir}/mtrace"
-FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
-FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
-FILES_catchsegv = "${bindir}/catchsegv"
-RDEPENDS_catchsegv = "libsegfault"
-FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
-FILES_glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
-RPROVIDES_${PN}-dev += "libc-dev"
-RPROVIDES_${PN}-staticdev += "libc-staticdev"
-
-SUMMARY_sln = "The static ln"
-DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked.  sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional."
-SUMMARY_nscd = "Name service cache daemon"
-DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information.  It can damatically improvide performance with remote, such as NIS or NIS+, name services."
-SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries"
-DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services."
-SUMMARY_ldd = "print shared library dependencies"
-DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line."
-SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc"
-DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, rpcgen, ..."
-DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
-DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
+FILES:${PN}-mtrace = "${bindir}/mtrace"
+FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
+FILES:${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES:catchsegv = "${bindir}/catchsegv"
+RDEPENDS:catchsegv = "libsegfault"
+FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
+FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
+RPROVIDES:${PN}-dev += "libc-dev"
+RPROVIDES:${PN}-staticdev += "libc-staticdev"
+
+SUMMARY:sln = "The static ln"
+DESCRIPTION:sln = "Similar to the 'ln' utility, but statically linked.  sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional."
+SUMMARY:nscd = "Name service cache daemon"
+DESCRIPTION:nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information.  It can damatically improvide performance with remote, such as NIS or NIS+, name services."
+SUMMARY:glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries"
+DESCRIPTION:glibc-extra-nss = "glibc: nis, nisplus and hesiod search services."
+SUMMARY:ldd = "print shared library dependencies"
+DESCRIPTION:ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line."
+SUMMARY:${PN}-utils = "Miscellaneous utilities provided by glibc"
+DESCRIPTION:${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, rpcgen, ..."
+DESCRIPTION:libsotruss = "Library to support sotruss which traces calls through PLTs"
+DESCRIPTION:tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
 
 inherit libc-common multilib_header
 
-do_install_append () {
+do_install:append () {
 	rm -f ${D}${sysconfdir}/localtime
 	rm -rf ${D}${localstatedir}
 
@@ -112,7 +112,7 @@ do_install_append () {
 	fi
 }
 
-do_install_append_aarch64 () {
+do_install:append:aarch64 () {
 	if [ "${base_libdir}" != "/lib" ] ; then
 		# The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1
 		install -d ${D}/lib
@@ -127,11 +127,11 @@ do_install_append_aarch64 () {
 	do_install_armmultilib
 }
 
-do_install_append_arm () {
+do_install:append:arm () {
 	do_install_armmultilib
 }
 
-do_install_append_armeb () {
+do_install:append:armeb () {
 	do_install_armmultilib
 }
 
@@ -212,7 +212,7 @@ do_poststash_install_cleanup () {
 }
 addtask do_poststash_install_cleanup after do_stash_locale do_install before do_populate_sysroot do_package
 
-pkg_postinst_nscd () {
+pkg_postinst:nscd () {
 	if [ -z "$D" ]; then
 		if command -v systemd-tmpfiles >/dev/null; then
 			systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf
@@ -221,7 +221,7 @@ pkg_postinst_nscd () {
 		fi
 	fi
 }
-CONFFILES_nscd="${sysconfdir}/nscd.conf"
+CONFFILES:nscd="${sysconfdir}/nscd.conf"
 
 SYSTEMD_PACKAGES = "nscd"
-SYSTEMD_SERVICE_nscd = "nscd.service"
+SYSTEMD_SERVICE:nscd = "nscd.service"
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-scripts.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-scripts.inc
index 2a2b4150..1551a71c 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-scripts.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-scripts.inc
@@ -2,7 +2,7 @@ require glibc-collateral.inc
 
 SUMMARY = "utility scripts provided by glibc"
 DESCRIPTION = "utility scripts provided by glibc"
-RDEPENDS_${PN} = "bash glibc-mtrace"
+RDEPENDS:${PN} = "bash glibc-mtrace"
 
 SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
 
@@ -17,4 +17,4 @@ do_install() {
 
 # sotruss script requires sotruss-lib.so (given by libsotruss package), 
 # to produce trace of the library calls.
-RDEPENDS_${PN} += "libsotruss"
+RDEPENDS:${PN} += "libsotruss"
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc-testing.inc b/meta-ilp32/recipes-overlayed/glibc/glibc-testing.inc
index 0a42ae7f..f8429d61 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc-testing.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc-testing.inc
@@ -1,4 +1,4 @@
-do_compile_append () {
+do_compile:append () {
 	# now generate script to drive testing
 	echo "#!/usr/bin/env sh" >${B}/${HOST_PREFIX}testglibc
 	set >> ${B}/${HOST_PREFIX}testglibc
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc.inc b/meta-ilp32/recipes-overlayed/glibc/glibc.inc
index 21bbdc2a..596029fc 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc.inc
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc.inc
@@ -3,8 +3,8 @@ require glibc-ld.inc
 require glibc-testing.inc
 
 STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
-STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
-PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
+STAGINGCC:class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
+PATH:prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
 
 python () {
     opt_effective = "-O"
@@ -25,7 +25,7 @@ python () {
 # Here we create a hacked up libc linker script and pass in the right
 # flags to let configure work. Ugly.
 EXTRASITECONFIG = "CFLAGS='${CFLAGS} -Wl,-L${WORKDIR}/site_config_libc -L${WORKDIR}/site_config_libc -L${SYSROOT_DESTDIR}${libdir} -L${SYSROOT_DESTDIR}${base_libdir} -Wl,-L${SYSROOT_DESTDIR}${libdir} -Wl,-L${SYSROOT_DESTDIR}${base_libdir}'"
-siteconfig_do_siteconfig_gencache_prepend = " \
+siteconfig_do_siteconfig_gencache:prepend = " \
 	mkdir -p ${WORKDIR}/site_config_libc; \
 	cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \
 	sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \
@@ -51,7 +51,7 @@ CACHED_CONFIGUREVARS += " \
 "
 
 GLIBC_EXTRA_OECONF ?= ""
-GLIBC_EXTRA_OECONF_class-nativesdk = ""
+GLIBC_EXTRA_OECONF:class-nativesdk = ""
 INHIBIT_DEFAULT_DEPS = "1"
 
 # This needs to match with glibc-collateral.inc, otherwise glibc-scripts and glibc-locale
@@ -71,14 +71,14 @@ PARALLEL_MAKE = ""
 # ensure make uses /bin/bash
 EXTRA_OEMAKE += "SHELL=/bin/bash"
 
-do_configure_prepend() {
+do_configure:prepend() {
 	sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
 }
 
 GLIBC_ADDONS ?= "nptl,libidn"
 
 # Enable backtrace from abort()
-do_configure_append_arm () {
+do_configure:append:arm () {
 	echo "CFLAGS-abort.c = -fasynchronous-unwind-tables" >> ${B}/configparms
 	echo "CFLAGS-raise.c = -fasynchronous-unwind-tables" >> ${B}/configparms
 }
diff --git a/meta-ilp32/recipes-overlayed/glibc/glibc_2.26.bb b/meta-ilp32/recipes-overlayed/glibc/glibc_2.26.bb
index c4ca0db2..a5b7ef12 100644
--- a/meta-ilp32/recipes-overlayed/glibc/glibc_2.26.bb
+++ b/meta-ilp32/recipes-overlayed/glibc/glibc_2.26.bb
@@ -45,7 +45,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
 "
 
 NATIVESDKFIXES ?= ""
-NATIVESDKFIXES_class-nativesdk = "\
+NATIVESDKFIXES:class-nativesdk = "\
            file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \
            file://0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \
            file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \
@@ -66,7 +66,7 @@ GLIBC_BROKEN_LOCALES = ""
 # We will skip parsing glibc when target system C library selection is not glibc
 # this helps in easing out parsing for non-glibc system libraries
 #
-COMPATIBLE_HOST_libc-musl_class-target = "null"
+COMPATIBLE_HOST:libc-musl:class-target = "null"
 
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
                 --without-cvs --disable-profile \
@@ -87,7 +87,7 @@ EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
 EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', '--enable-nscd', '--disable-nscd', d)}"
 
 
-do_patch_append() {
+do_patch:append() {
     bb.build.exec_func('do_fix_readlib_c', d)
 }
 
@@ -140,7 +140,7 @@ do_compile () {
 
 # Use the host locale archive when built for nativesdk so that we don't need to
 # ship a complete (100MB) locale set.
-do_compile_prepend_class-nativesdk() {
+do_compile:prepend:class-nativesdk() {
     echo "complocaledir=/usr/lib/locale" >> ${S}/configparms
 }
 
diff --git a/meta-ilp32/recipes-overlayed/grub/grub_git.bb b/meta-ilp32/recipes-overlayed/grub/grub_git.bb
index cce2d521..5555a63c 100644
--- a/meta-ilp32/recipes-overlayed/grub/grub_git.bb
+++ b/meta-ilp32/recipes-overlayed/grub/grub_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING;md5=ed1dca40ee0852c630f19c06fdecf6
 inherit deploy
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_arm = "1"
+DEFAULT_PREFERENCE:arm = "1"
 
 PV = "2.00-prebuilt"
 
@@ -25,6 +25,6 @@ do_deploy() {
     cp -a ${B}/grubaa64.efi ${DEPLOYDIR}
 }
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 addtask deploy before do_build after do_install
diff --git a/meta-ilp32/recipes-overlayed/optee-os/optee-os_git.bbappend b/meta-ilp32/recipes-overlayed/optee-os/optee-os_git.bbappend
index a7935d3b..92fbfe20 100644
--- a/meta-ilp32/recipes-overlayed/optee-os/optee-os_git.bbappend
+++ b/meta-ilp32/recipes-overlayed/optee-os/optee-os_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-set-flag-to-build-in-lp64-mode-for-ilp32-toolchain.patch \
 file://0001-Link-using-64-bits.patch \
diff --git a/meta-ilp32/recipes-support/gnutls/gnutls_%.bbappend b/meta-ilp32/recipes-support/gnutls/gnutls_%.bbappend
index 24feee77..1f124ce9 100644
--- a/meta-ilp32/recipes-support/gnutls/gnutls_%.bbappend
+++ b/meta-ilp32/recipes-support/gnutls/gnutls_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-disable-acceleration-as-we-are-building-for-ilp32.patch"
diff --git a/meta-ilp32/recipes-support/nspr/nspr_%.bbappend b/meta-ilp32/recipes-support/nspr/nspr_%.bbappend
index c699fec7..efc30f88 100644
--- a/meta-ilp32/recipes-support/nspr/nspr_%.bbappend
+++ b/meta-ilp32/recipes-support/nspr/nspr_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-Add-arm64-ILP32-support-to-nspr-config.patch"
diff --git a/meta-ilp32/recipes-support/perl/perl_5.24.%.bbappend b/meta-ilp32/recipes-support/perl/perl_5.24.%.bbappend
index 51dbc523..aa918081 100644
--- a/meta-ilp32/recipes-support/perl/perl_5.24.%.bbappend
+++ b/meta-ilp32/recipes-support/perl/perl_5.24.%.bbappend
@@ -1,4 +1,4 @@
-do_configure_append() {
+do_configure:append() {
     # Fixups for ILP32
     # This is to do away with LIB_VERSION, no longer defined
     # by math.h in recent versions of GLIBC.
diff --git a/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend b/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend
index c71028c8..ebd391b1 100644
--- a/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://linaro.cfg \
            "
diff --git a/meta-linaro-integration/recipes-core/systemd/systemd-serialgetty.bbappend b/meta-linaro-integration/recipes-core/systemd/systemd-serialgetty.bbappend
index 8ec0f197..0d8fb581 100644
--- a/meta-linaro-integration/recipes-core/systemd/systemd-serialgetty.bbappend
+++ b/meta-linaro-integration/recipes-core/systemd/systemd-serialgetty.bbappend
@@ -1,2 +1,2 @@
 PR = "r5.1"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-linaro-integration/recipes-core/systemd/systemd_%.bbappend b/meta-linaro-integration/recipes-core/systemd/systemd_%.bbappend
index 66419842..cd61852d 100644
--- a/meta-linaro-integration/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-linaro-integration/recipes-core/systemd/systemd_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " resolved networkd gcrypt"
+PACKAGECONFIG:append = " resolved networkd gcrypt"
diff --git a/meta-linaro-integration/recipes-overlayed/efivar/efivar_0.23.bb b/meta-linaro-integration/recipes-overlayed/efivar/efivar_0.23.bb
index a3630516..558650e6 100644
--- a/meta-linaro-integration/recipes-overlayed/efivar/efivar_0.23.bb
+++ b/meta-linaro-integration/recipes-overlayed/efivar/efivar_0.23.bb
@@ -5,24 +5,24 @@ HOMEPAGE = "https://github.com/rhinstaller/efivar"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393"
 
-DEPENDS_class-target = "popt efivar-native"
+DEPENDS:class-target = "popt efivar-native"
 
 inherit pkgconfig
 
 SRCREV = "7367d78281fa3ce390e10c7c9f4608c58e7a6d3d"
 SRC_URI = "git://github.com/rhinstaller/efivar.git"
-SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \
+SRC_URI:append:class-target = " file://0001-efivar-fix-for-cross-compile.patch \
                               "
 S = "${WORKDIR}/git"
 
 # Setting CROSS_COMPILE breaks pkgconfig, so just set AR
 EXTRA_OEMAKE = "AR=${TARGET_PREFIX}gcc-ar"
 
-do_compile_prepend() {
+do_compile:prepend() {
     sed -i -e s:-Werror::g ${S}/gcc.specs
 }
 
-do_compile_class-native() {
+do_compile:class-native() {
     oe_runmake -C src makeguids
 }
 
@@ -37,7 +37,7 @@ do_install() {
     oe_runmake install DESTDIR=${D}
 }
 
-do_install_class-native() {
+do_install:class-native() {
     install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids
 }
 
diff --git a/meta-linaro-integration/recipes-overlayed/gd/gd_2.1.1.bb b/meta-linaro-integration/recipes-overlayed/gd/gd_2.1.1.bb
index 62008dfb..bca695fe 100644
--- a/meta-linaro-integration/recipes-overlayed/gd/gd_2.1.1.bb
+++ b/meta-linaro-integration/recipes-overlayed/gd/gd_2.1.1.bb
@@ -34,9 +34,9 @@ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
 
 PACKAGES += "${PN}-tools"
 
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-tools = "${bindir}/*"
+FILES:${PN} = "${libdir}/lib*${SOLIBS}"
+FILES:${PN}-tools = "${bindir}/*"
 
 PROVIDES += "${PN}-tools"
-RPROVIDES_${PN}-tools = "${PN}-tools"
-RDEPENDS_${PN}-tools = "perl perl-module-strict"
+RPROVIDES:${PN}-tools = "${PN}-tools"
+RDEPENDS:${PN}-tools = "perl perl-module-strict"
diff --git a/meta-linaro-integration/recipes-overlayed/kselftests/kselftests_4.9.bb b/meta-linaro-integration/recipes-overlayed/kselftests/kselftests_4.9.bb
index a7b4ba67..8a74cda0 100644
--- a/meta-linaro-integration/recipes-overlayed/kselftests/kselftests_4.9.bb
+++ b/meta-linaro-integration/recipes-overlayed/kselftests/kselftests_4.9.bb
@@ -106,48 +106,48 @@ PACKAGE_BEFORE_PN = " \
 	${PN}-zram \
 "
 
-FILES_${PN}-breakpoints = "${bindir}/kselftests/breakpoints"
-FILES_${PN}-capabilities = "${bindir}/kselftests/capabilities"
-FILES_${PN}-cpu-hotplug = "${bindir}/kselftests/cpu-hotplug"
-FILES_${PN}-efivarfs = "${bindir}/kselftests/efivarfs"
-FILES_${PN}-exec = "${bindir}/kselftests/exec"
-FILES_${PN}-firmware = "${bindir}/kselftests/firmware"
-FILES_${PN}-ftrace = "${bindir}/kselftests/ftrace"
-FILES_${PN}-futex = "${bindir}/kselftests/futex"
-FILES_${PN}-ipc = "${bindir}/kselftests/ipc"
-FILES_${PN}-kcmp = "${bindir}/kselftests/kcmp"
-FILES_${PN}-lib = "${bindir}/kselftests/lib"
-FILES_${PN}-membarrier = "${bindir}/kselftests/membarrier"
-FILES_${PN}-memfd = "${bindir}/kselftests/memfd"
-FILES_${PN}-memory-hotplug = "${bindir}/kselftests/memory-hotplug"
-FILES_${PN}-mount = "${bindir}/kselftests/mount"
-FILES_${PN}-mqueue = "${bindir}/kselftests/mqueue"
-FILES_${PN}-net = "${bindir}/kselftests/net"
-FILES_${PN}-nsfs = "${bindir}/kselftests/nsfs"
-FILES_${PN}-powerpc = "${bindir}/kselftests/powerpc"
-FILES_${PN}-pstore = "${bindir}/kselftests/pstore"
-FILES_${PN}-ptrace = "${bindir}/kselftests/ptrace"
-FILES_${PN}-seccomp = "${bindir}/kselftests/seccomp"
-FILES_${PN}-sigaltstack = "${bindir}/kselftests/sigaltstack"
-FILES_${PN}-size = "${bindir}/kselftests/size"
-FILES_${PN}-static-keys = "${bindir}/kselftests/static_keys"
-FILES_${PN}-sysctl = "${bindir}/kselftests/sysctl"
-FILES_${PN}-timers = "${bindir}/kselftests/timers"
-FILES_${PN}-user = "${bindir}/kselftests/user"
-FILES_${PN}-vm = "${bindir}/kselftests/vm"
-FILES_${PN}-x86 = "${bindir}/kselftests/x86"
-FILES_${PN}-zram = "${bindir}/kselftests/zram"
-FILES_${PN}-dbg += "${bindir}/kselftests/*/.debug"
-
-ALLOW_EMPTY_${PN}-capabilities = "1"
-
-RDEPENDS_${PN}-cpu-hotplug += "bash"
-RDEPENDS_${PN}-efivarfs += "bash"
-RDEPENDS_${PN}-memory-hotplug += "bash"
-RDEPENDS_${PN}-net += "bash"
-RDEPENDS_${PN}-vm += "bash"
-RDEPENDS_${PN}-zram += "bash"
-RDEPENDS_${PN} += "bash \
+FILES:${PN}-breakpoints = "${bindir}/kselftests/breakpoints"
+FILES:${PN}-capabilities = "${bindir}/kselftests/capabilities"
+FILES:${PN}-cpu-hotplug = "${bindir}/kselftests/cpu-hotplug"
+FILES:${PN}-efivarfs = "${bindir}/kselftests/efivarfs"
+FILES:${PN}-exec = "${bindir}/kselftests/exec"
+FILES:${PN}-firmware = "${bindir}/kselftests/firmware"
+FILES:${PN}-ftrace = "${bindir}/kselftests/ftrace"
+FILES:${PN}-futex = "${bindir}/kselftests/futex"
+FILES:${PN}-ipc = "${bindir}/kselftests/ipc"
+FILES:${PN}-kcmp = "${bindir}/kselftests/kcmp"
+FILES:${PN}-lib = "${bindir}/kselftests/lib"
+FILES:${PN}-membarrier = "${bindir}/kselftests/membarrier"
+FILES:${PN}-memfd = "${bindir}/kselftests/memfd"
+FILES:${PN}-memory-hotplug = "${bindir}/kselftests/memory-hotplug"
+FILES:${PN}-mount = "${bindir}/kselftests/mount"
+FILES:${PN}-mqueue = "${bindir}/kselftests/mqueue"
+FILES:${PN}-net = "${bindir}/kselftests/net"
+FILES:${PN}-nsfs = "${bindir}/kselftests/nsfs"
+FILES:${PN}-powerpc = "${bindir}/kselftests/powerpc"
+FILES:${PN}-pstore = "${bindir}/kselftests/pstore"
+FILES:${PN}-ptrace = "${bindir}/kselftests/ptrace"
+FILES:${PN}-seccomp = "${bindir}/kselftests/seccomp"
+FILES:${PN}-sigaltstack = "${bindir}/kselftests/sigaltstack"
+FILES:${PN}-size = "${bindir}/kselftests/size"
+FILES:${PN}-static-keys = "${bindir}/kselftests/static_keys"
+FILES:${PN}-sysctl = "${bindir}/kselftests/sysctl"
+FILES:${PN}-timers = "${bindir}/kselftests/timers"
+FILES:${PN}-user = "${bindir}/kselftests/user"
+FILES:${PN}-vm = "${bindir}/kselftests/vm"
+FILES:${PN}-x86 = "${bindir}/kselftests/x86"
+FILES:${PN}-zram = "${bindir}/kselftests/zram"
+FILES:${PN}-dbg += "${bindir}/kselftests/*/.debug"
+
+ALLOW_EMPTY:${PN}-capabilities = "1"
+
+RDEPENDS:${PN}-cpu-hotplug += "bash"
+RDEPENDS:${PN}-efivarfs += "bash"
+RDEPENDS:${PN}-memory-hotplug += "bash"
+RDEPENDS:${PN}-net += "bash"
+RDEPENDS:${PN}-vm += "bash"
+RDEPENDS:${PN}-zram += "bash"
+RDEPENDS:${PN} += "bash \
 	${PN}-capabilities \
 	${PN}-cpu-hotplug \
 	${PN}-efivarfs \
@@ -177,9 +177,9 @@ RDEPENDS_${PN} += "bash \
 	${PN}-zram \
 "
 
-RDEPENDS_${PN}_append_x86 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
-RDEPENDS_${PN}_append_x86-64 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
-RDEPENDS_${PN}_append_powerpc = " ${PN}-powerpc"
-RDEPENDS_${PN}_append_powerpc64 = " ${PN}-powerpc"
+RDEPENDS:${PN}:append:x86 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
+RDEPENDS:${PN}:append:x86-64 = " ${PN}-breakpoints ${PN}-ipc ${PN}-x86"
+RDEPENDS:${PN}:append:powerpc = " ${PN}-powerpc"
+RDEPENDS:${PN}:append:powerpc64 = " ${PN}-powerpc"
 
-INSANE_SKIP_${PN} = "already-stripped"
+INSANE_SKIP:${PN} = "already-stripped"
diff --git a/meta-linaro-integration/recipes-overlayed/linux-libc-headers/linux-libc-headers_4.12.bb b/meta-linaro-integration/recipes-overlayed/linux-libc-headers/linux-libc-headers_4.12.bb
index 64240900..f917a2c3 100644
--- a/meta-linaro-integration/recipes-overlayed/linux-libc-headers/linux-libc-headers_4.12.bb
+++ b/meta-linaro-integration/recipes-overlayed/linux-libc-headers/linux-libc-headers_4.12.bb
@@ -67,11 +67,11 @@ do_install() {
 	find ${D}${includedir} -name ..install.cmd | xargs rm -f
 }
 
-do_install_append_aarch64 () {
+do_install:append:aarch64 () {
         do_install_armmultilib
 }
 
-do_install_append_arm () {
+do_install:append:arm () {
 	do_install_armmultilib
 }
 
@@ -82,8 +82,8 @@ do_install_armmultilib () {
 
 BBCLASSEXTEND = "nativesdk"
 
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+RDEPENDS:${PN}-dev = ""
+RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
diff --git a/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb b/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb
index 1003299a..39caf7d5 100644
--- a/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb
+++ b/meta-linaro-integration/recipes-overlayed/linux/linux-dummy.bb
@@ -14,9 +14,9 @@ PACKAGES_DYNAMIC += "^kernel-image-.*"
 PACKAGES_DYNAMIC += "^kernel-firmware-.*"
 
 PACKAGES += "kernel-modules"
-FILES_kernel-modules = ""
-ALLOW_EMPTY_kernel-modules = "1"
-DESCRIPTION_kernel-modules = "Kernel modules meta package"
+FILES:kernel-modules = ""
+ALLOW_EMPTY:kernel-modules = "1"
+DESCRIPTION:kernel-modules = "Kernel modules meta package"
 
 # Set a fake kernel version to make various checks happy
 KERNEL_VERSION = "3.18"
diff --git a/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb b/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb
index 2483a15b..a3aeac72 100644
--- a/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb
@@ -14,18 +14,18 @@ SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67
 inherit autotools distro_features_check
 
 # /etc/nsswitch.conf needs to be present
-RDEPENDS_${PN} = "base-files"
+RDEPENDS:${PN} = "base-files"
 
 # The systemd has its own copy of nss-myhostname
 CONFLICT_DISTRO_FEATURES = "systemd"
 
-pkg_postinst_${PN} () {
+pkg_postinst:${PN} () {
 	sed -e '/^hosts:/s/\s*\<myhostname\>//' \
 		-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
 		-i $D${sysconfdir}/nsswitch.conf
 }
 
-pkg_prerm_${PN} () {
+pkg_prerm:${PN} () {
 	sed -e '/^hosts:/s/\s*\<myhostname\>//' \
 		-e '/^hosts:/s/\s*myhostname//' \
 		-i $D${sysconfdir}/nsswitch.conf
diff --git a/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend b/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend
index 2350ab8b..d5cd6996 100644
--- a/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend
+++ b/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://securetty"
diff --git a/meta-linaro-integration/recipes-support/gmp/gmp_%.bbappend b/meta-linaro-integration/recipes-support/gmp/gmp_%.bbappend
index 85f2549e..ff19a4f7 100644
--- a/meta-linaro-integration/recipes-support/gmp/gmp_%.bbappend
+++ b/meta-linaro-integration/recipes-support/gmp/gmp_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-configure.ac-add-build-options-for-ilp32.patch"
diff --git a/meta-linaro-integration/recipes-test/fwts/fwts_git.bb b/meta-linaro-integration/recipes-test/fwts/fwts_git.bb
index c500f030..3ee0c823 100644
--- a/meta-linaro-integration/recipes-test/fwts/fwts_git.bb
+++ b/meta-linaro-integration/recipes-test/fwts/fwts_git.bb
@@ -22,10 +22,10 @@ inherit autotools pkgconfig
 
 CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas"
 
-FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}"
-FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"
-FILES_${PN}-staticdev += "${libdir}/fwts/lib*a"
-FILES_${PN}-dbg += "${libdir}/fwts/.debug"
+FILES:${PN} += "${libdir}/fwts/lib*${SOLIBS}"
+FILES:${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"
+FILES:${PN}-staticdev += "${libdir}/fwts/lib*a"
+FILES:${PN}-dbg += "${libdir}/fwts/.debug"
 
 TOOLCHAIN = "gcc"
 
diff --git a/meta-linaro/conf/machine/genericarmv7a.conf b/meta-linaro/conf/machine/genericarmv7a.conf
index 3f71e601..f8f0ea1c 100644
--- a/meta-linaro/conf/machine/genericarmv7a.conf
+++ b/meta-linaro/conf/machine/genericarmv7a.conf
@@ -17,14 +17,14 @@ XSERVER ?= "xserver-xorg \
 MACHINE_FEATURES = "usbhost screen"
 
 # Don't include kernels in standard images
-RDEPENDS_kernel-base = ""
+RDEPENDS:kernel-base = ""
 
 # Use a common kernel recipe for all QEMU machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-vexpress"
 
 KERNEL_IMAGETYPE = "zImage"
 
-GRUBPLATFORM_pn-grub = "efi"
+GRUBPLATFORM:pn-grub = "efi"
 
 # Force auto-serial-console to be used by all image types
 # Ideally this would be part of core oe or as a bbclassappend,
diff --git a/meta-linaro/conf/machine/genericarmv7ab.conf b/meta-linaro/conf/machine/genericarmv7ab.conf
index 355c67bd..b1382320 100644
--- a/meta-linaro/conf/machine/genericarmv7ab.conf
+++ b/meta-linaro/conf/machine/genericarmv7ab.conf
@@ -7,4 +7,4 @@ DEFAULTTUNE ?= "armv7ab"
 require conf/machine/genericarmv7a.conf
 
 # No qemu support, yet
-# MACHINE_FEATURES_remove = "qemu-usermode"
+# MACHINE_FEATURES:remove = "qemu-usermode"
diff --git a/meta-linaro/conf/machine/genericarmv8.conf b/meta-linaro/conf/machine/genericarmv8.conf
index 27052ec0..00abe9d1 100644
--- a/meta-linaro/conf/machine/genericarmv8.conf
+++ b/meta-linaro/conf/machine/genericarmv8.conf
@@ -16,7 +16,7 @@ XSERVER ?= "xserver-xorg \
 MACHINE_FEATURES = ""
 
 # Don't include kernels in standard images
-RDEPENDS_kernel-base = ""
+RDEPENDS:kernel-base = ""
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro"
 
diff --git a/meta-linaro/conf/machine/genericarmv8b.conf b/meta-linaro/conf/machine/genericarmv8b.conf
index 96836a41..cc19a9a9 100644
--- a/meta-linaro/conf/machine/genericarmv8b.conf
+++ b/meta-linaro/conf/machine/genericarmv8b.conf
@@ -8,4 +8,4 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
 require conf/machine/genericarmv8.conf
 
 # No qemu support, yet
-MACHINE_FEATURES_remove = "qemu-usermode"
+MACHINE_FEATURES:remove = "qemu-usermode"
diff --git a/meta-linaro/recipes-core/initrdscripts/initramfs-boot-linaro_1.0.bb b/meta-linaro/recipes-core/initrdscripts/initramfs-boot-linaro_1.0.bb
index 4e5ca09a..bc8a3655 100644
--- a/meta-linaro/recipes-core/initrdscripts/initramfs-boot-linaro_1.0.bb
+++ b/meta-linaro/recipes-core/initrdscripts/initramfs-boot-linaro_1.0.bb
@@ -10,4 +10,4 @@ do_install() {
 
 inherit allarch
 
-FILES_${PN} += " /init "
+FILES:${PN} += " /init "
diff --git a/meta-linaro/recipes-extra/arndale-pre-boot/arndale-pre-boot_0.0.2.20130101.bb b/meta-linaro/recipes-extra/arndale-pre-boot/arndale-pre-boot_0.0.2.20130101.bb
index 46de0d8e..f1123546 100644
--- a/meta-linaro/recipes-extra/arndale-pre-boot/arndale-pre-boot_0.0.2.20130101.bb
+++ b/meta-linaro/recipes-extra/arndale-pre-boot/arndale-pre-boot_0.0.2.20130101.bb
@@ -21,4 +21,4 @@ PACKAGE_ARCH = "all"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = "/lib/firmware/arndale/arndale-bl1.bin"
+FILES:${PN} = "/lib/firmware/arndale/arndale-bl1.bin"
diff --git a/meta-linaro/recipes-extra/daq-odp/daq-odp.bb b/meta-linaro/recipes-extra/daq-odp/daq-odp.bb
index 6153cdbd..436d5d6d 100644
--- a/meta-linaro/recipes-extra/daq-odp/daq-odp.bb
+++ b/meta-linaro/recipes-extra/daq-odp/daq-odp.bb
@@ -14,5 +14,5 @@ S = "${WORKDIR}/git"
 
 inherit autotools
 
-FILES_${PN} += "${libdir}/daq/daq_odp.so ${libdir}/daq/daq_odp.la"
-FILES_${PN}-dbg += "${libdir}/daq/.debug/daq_odp.so"
+FILES:${PN} += "${libdir}/daq/daq_odp.so ${libdir}/daq/daq_odp.la"
+FILES:${PN}-dbg += "${libdir}/daq/.debug/daq_odp.so"
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb
index 10999d61..8f47cbb2 100644
--- a/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfdump2_20121130.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://GPL.txt;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI += "file://fix-dump.patch"
 
-do_compile_prepend() {
+do_compile:prepend() {
 	oe_runmake CXX="${BUILD_CXX}" \
 		CXXFLAGS="${BUILD_CXXFLAGS} -I${S}/../libdwarf/ -I." \
 		LDFLAGS="${BUILD_LDFLAGS} -ldwarf -lelf" NATIVE=1
diff --git a/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb
index 1befb314..60324090 100644
--- a/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb
+++ b/meta-linaro/recipes-extra/dwarfutils/dwarfdump_20121130.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://GPL.txt;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI += "file://fix-dump.patch"
 
-do_compile_prepend() {
+do_compile:prepend() {
 	oe_runmake CC="${BUILD_CC}" \
 		CFLAGS="${BUILD_CFLAGS} -I${S}/../libdwarf/ -I." \
 		LDFLAGS="${BUILD_LDFLAGS} -ldwarf -lelf" NATIVE=1
diff --git a/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb b/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb
index 828e0d04..01f3d895 100644
--- a/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb
+++ b/meta-linaro/recipes-extra/dwarfutils/libdwarf_20121130.bb
@@ -8,6 +8,6 @@ do_install() {
     install -m 0644 ${S}/dwarf.h ${S}/libdwarf.h ${D}${includedir}/libdwarf
 }
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-linaro/recipes-extra/ganglia/ganglia_3.6.0.bb b/meta-linaro/recipes-extra/ganglia/ganglia_3.6.0.bb
index 22cab218..b65213af 100644
--- a/meta-linaro/recipes-extra/ganglia/ganglia_3.6.0.bb
+++ b/meta-linaro/recipes-extra/ganglia/ganglia_3.6.0.bb
@@ -30,12 +30,12 @@ inherit pkgconfig autotools-brokensep python3native update-rc.d
 # ltmain.sh (and others) in libmetrics and as such the build will
 # fail.  We explicitly force regeneration of that directory.
 
-do_configure_append() {
+do_configure:append() {
        (cd ${S} ; autoreconf -fvi )
        (cd ${S}/libmetrics ; autoreconf -fvi)
 }
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/init.d
     # gmetad expects the following directory and owned by user 'nobody'
     install -o nobody -d ${D}${localstatedir}/lib/${PN}/rrds
@@ -55,16 +55,16 @@ do_install_append() {
 
 PACKAGES =+ "gmetad"
 
-RDEPENDS_${PN} = "gmetad"
+RDEPENDS:${PN} = "gmetad"
 
 BBCLASSEXTEND = "native"
 
-FILES_gmetad = "\
+FILES:gmetad = "\
     ${sbindir}/gmetad \
     ${sysconfdir}/init.d/gmetad \
 "
 
 INITSCRIPT_PACKAGES = "${PN} gmetad"
-INITSCRIPT_NAME_ganglia = "gmond"
-INITSCRIPT_NAME_gmetad = "gmetad"
+INITSCRIPT_NAME:ganglia = "gmond"
+INITSCRIPT_NAME:gmetad = "gmetad"
 INITSCRIPT_PARAMS = "defaults 66"
diff --git a/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb b/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb
index 1477812c..5ca3cc9b 100644
--- a/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb
+++ b/meta-linaro/recipes-extra/hiphopvm/hiphopvm_git.bb
@@ -33,7 +33,7 @@ ${EXTRA_DEPENDS} \
 
 # optional (for now) dependencies:
 EXTRA_DEPENDS = "gperftools"
-EXTRA_DEPENDS_aarch64 = ""
+EXTRA_DEPENDS:aarch64 = ""
 
 # 64-bit platforms only
 COMPATIBLE_HOST = '(x86_64.*|aarch64.*)-linux'
@@ -54,7 +54,7 @@ PV = "2.0.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-do_configure_prepend() {
+do_configure:prepend() {
 	export HPHP_HOME="${B}"
 	export HPHP_LIB="${B}"/bin
 	export USE_HHVM=1
diff --git a/meta-linaro/recipes-extra/lng-network-config/lng-network-config_0.1.bb b/meta-linaro/recipes-extra/lng-network-config/lng-network-config_0.1.bb
index 153ee73a..1bc38e8f 100644
--- a/meta-linaro/recipes-extra/lng-network-config/lng-network-config_0.1.bb
+++ b/meta-linaro/recipes-extra/lng-network-config/lng-network-config_0.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "This package contains LNG specific configuration"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-RDEPENDS_${PN} = "udev"
+RDEPENDS:${PN} = "udev"
 
 SRC_URI = "file://70-persistent-net.rules"
 
diff --git a/meta-linaro/recipes-extra/meta-toolchain-hhvm/packagegroup-core-standalone-hhvm-sdk-target.bb b/meta-linaro/recipes-extra/meta-toolchain-hhvm/packagegroup-core-standalone-hhvm-sdk-target.bb
index 4a612995..57fc0206 100644
--- a/meta-linaro/recipes-extra/meta-toolchain-hhvm/packagegroup-core-standalone-hhvm-sdk-target.bb
+++ b/meta-linaro/recipes-extra/meta-toolchain-hhvm/packagegroup-core-standalone-hhvm-sdk-target.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     packagegroup-core-standalone-sdk-target \
     binutils-dev \
     binutils-staticdev \
diff --git a/meta-linaro/recipes-extra/odp/odp_v1.10.0.0.bb b/meta-linaro/recipes-extra/odp/odp_v1.10.0.0.bb
index 27ce3c39..4aeffe11 100644
--- a/meta-linaro/recipes-extra/odp/odp_v1.10.0.0.bb
+++ b/meta-linaro/recipes-extra/odp/odp_v1.10.0.0.bb
@@ -34,22 +34,22 @@ do_install_ptest() {
 
 PACKAGES =+ "${PN}-bin-dbg ${PN}-helper-dbg ${PN}-ptest-dbg ${PN}-helper-staticdev ${PN}-bin ${PN}-helper ${PN}-helper-dev"
 # ODP is primarily shipped as static library plus some API test and samples/
-FILES_${PN}-staticdev += "${libdir}/libodp-linux.a"
-FILES_${PN}-helper-staticdev += "${libdir}/libodphelper-linux.a"
-FILES_${PN}-helper-dev = " \
+FILES:${PN}-staticdev += "${libdir}/libodp-linux.a"
+FILES:${PN}-helper-staticdev += "${libdir}/libodphelper-linux.a"
+FILES:${PN}-helper-dev = " \
 	${includedir}/odp/helper/* \
 	${libdir}/libodphelper-linux.la \
 	${libdir}/libodphelper-linux.so \
 	${libdir}/pkgconfig/libodphelper-linux* \
 "
-FILES_${PN}-bin = " \
+FILES:${PN}-bin = " \
 	${bindir}/* \
 "
-FILES_${PN}-bin-dbg = " \
+FILES:${PN}-bin-dbg = " \
 	${bindir}/.debug/* \
 	${exec_prefix}/src/debug/${PN}/${PV}-${PR}/git/example/* \
 "
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
 	${includedir}/odp.h \
 	${includedir}/odp_api.h \
 	${includedir}/odp/api/* \
@@ -57,25 +57,25 @@ FILES_${PN}-dev = " \
 	${libdir}/libodp-linux.so \
 	${libdir}/pkgconfig/libodp-linux.* \
 "
-FILES_${PN}-helper += " \
+FILES:${PN}-helper += " \
 	${libdir}/libodphelper-linux.so.* \
 "
-FILES_${PN} += " \
+FILES:${PN} += " \
 	${libdir}/libodp-linux.so.* \
 "
-FILES_${PN}-ptest-dbg = " \
+FILES:${PN}-ptest-dbg = " \
 	${exec_prefix}/src/debug/${PN}/${PV}-${PR}/git/test/* \
 	${libdir}/odp/ptest/test/.debug/* \
 "
-FILES_${PN}-helper-dbg = " \
+FILES:${PN}-helper-dbg = " \
 	${libdir}/.debug/libodphelper-linux.so* \
 	${exec_prefix}/src/debug/${PN}/${PV}-${PR}/git/helper/* \
 "
-FILES_${PN}-dbg = " \
+FILES:${PN}-dbg = " \
 	${libdir}/.debug/libodp-linux.so* \
 	${exec_prefix}/src/debug/${PN}/${PV}-${PR}/git/include/* \
 	${exec_prefix}/src/debug/${PN}/${PV}-${PR}/git/platform/* \
 "
 
-RDEPENDS_${PN} = "bash libcrypto"
-RDEPENDS_${PN}-ptest = "bash cunit"
+RDEPENDS:${PN} = "bash libcrypto"
+RDEPENDS:${PN}-ptest = "bash cunit"
diff --git a/meta-linaro/recipes-extra/trinity/trinity_git.bb b/meta-linaro/recipes-extra/trinity/trinity_git.bb
index f0f09a85..eec3381c 100644
--- a/meta-linaro/recipes-extra/trinity/trinity_git.bb
+++ b/meta-linaro/recipes-extra/trinity/trinity_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 inherit useradd
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --create-home --shell /bin/sh ${PN} "
+USERADD_PARAM:${PN} = "--system --create-home --shell /bin/sh ${PN} "
 
 do_configure () {
     ./configure.sh
@@ -38,5 +38,5 @@ do_install () {
 
 PACKAGES =+ "${PN}-example"
 
-FILES_${PN} = "${bindir}/trinity"
-FILES_${PN}-example = "${datadir}/${PN}"
+FILES:${PN} = "${bindir}/trinity"
+FILES:${PN}-example = "${datadir}/${PN}"
diff --git a/meta-linaro/recipes-kernel/linux/bootwrapper.inc b/meta-linaro/recipes-kernel/linux/bootwrapper.inc
index 627c320b..1e6b24be 100644
--- a/meta-linaro/recipes-kernel/linux/bootwrapper.inc
+++ b/meta-linaro/recipes-kernel/linux/bootwrapper.inc
@@ -1,4 +1,4 @@
-SRC_URI_append= " git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git;protocol=http;branch=master;name=bootwrapper;destsuffix=bootwrapper \
+SRC_URI:append= " git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git;protocol=http;branch=master;name=bootwrapper;destsuffix=bootwrapper \
 "
 
 SRCREV_bootwrapper = "26a17ad59544f026878efdb0524ce66b7a314784"
@@ -13,7 +13,7 @@ export WRAPCPPFLAGS = "${CPPFLAGS}"
 export WRAPCXXFLAGS = "${CXXFLAGS}"
 export WRAPLDFLAGS = "${LDFLAGS}"
 
-do_compile_append() {
+do_compile:append() {
     oe_runmake dtbs
     cd ${BW}
 
@@ -52,11 +52,11 @@ do_compile_append() {
          IMAGE=img.axf
 }
 
-do_install_append() {
+do_install:append() {
          install -m 0644 ${BW}/img-foundation.axf ${D}/boot/img-foundation.axf
 }
 
-do_deploy_append() {
+do_deploy:append() {
     install -d ${DEPLOYDIR}
     install -m 0644 ${BW}/img.axf ${DEPLOYDIR}/img-${PV}.axf
     install -m 0644 ${BW}/linux-system-foundation.axf ${DEPLOYDIR}/linux-system-foundation-${PV}.axf
@@ -68,4 +68,4 @@ do_deploy_append() {
 }
 
 PACKAGES =+ "kernel-bootwrapper"
-FILES_kernel-bootwrapper = "/boot/img-foundation.axf"
+FILES:kernel-bootwrapper = "/boot/img-foundation.axf"
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_3.14.bb b/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_3.14.bb
index de8a2315..f95de527 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_3.14.bb
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_3.14.bb
@@ -7,7 +7,7 @@ SRCREV = "9af7f850aca5436eed9c4c1bb8aab56a362180ca"
 
 SRC_URI = "git://git.linaro.org/kernel/linux-linaro-lng.git;branch=linux-linaro-lng-v3.14-rt"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
      linaro/configs/preempt-rt.conf \
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_4.1.bb b/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_4.1.bb
index 17939050..027a5ca9 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_4.1.bb
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_4.1.bb
@@ -7,7 +7,7 @@ SRCREV = "48ffd0d5e7b2fb6e7d47344320dbeeaf15d6fd5a"
 
 SRC_URI = "git://git.linaro.org/kernel/linux-linaro-lng.git;branch=linux-linaro-lng-v4.1-rt"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
      linaro/configs/preempt-rt.conf \
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_3.14.bb b/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_3.14.bb
index 0b10629a..a8d9247e 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_3.14.bb
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_3.14.bb
@@ -7,7 +7,7 @@ SRCREV = "f2c17dabda24ce83502f83173abff0ce03ca137b"
 
 SRC_URI = "git://git.linaro.org/kernel/linux-linaro-lng.git;branch=linux-linaro-lng-v3.14"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
      linaro/configs/ovs.conf \
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_4.1.bb b/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_4.1.bb
index 87803359..d438ee5b 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_4.1.bb
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_4.1.bb
@@ -7,7 +7,7 @@ SRCREV = "b00df57e50e087151f4ca976ca2796ea105f68c1"
 
 SRC_URI = "git://git.linaro.org/kernel/linux-linaro-lng.git;branch=linux-linaro-lng-v4.1"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
      linaro/configs/ovs.conf \
diff --git a/meta-linaro/recipes-kernel/linux/linux-hikey-ilp32_4.12.bb b/meta-linaro/recipes-kernel/linux/linux-hikey-ilp32_4.12.bb
index 28abf785..413afe35 100644
--- a/meta-linaro/recipes-kernel/linux/linux-hikey-ilp32_4.12.bb
+++ b/meta-linaro/recipes-kernel/linux/linux-hikey-ilp32_4.12.bb
@@ -57,7 +57,7 @@ do_configure() {
     oe_runmake -C ${B} savedefconfig
 }
 
-do_deploy_append() {
+do_deploy:append() {
     cp -a ${B}/defconfig ${DEPLOYDIR}
     cp -a ${B}/.config ${DEPLOYDIR}/config
 }
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro-aarch64.bb b/meta-linaro/recipes-kernel/linux/linux-linaro-aarch64.bb
index fb5fbd54..78be5eab 100644
--- a/meta-linaro/recipes-kernel/linux/linux-linaro-aarch64.bb
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-aarch64.bb
@@ -3,10 +3,10 @@ DESCRIPTION = "Linaro recipe for Aarch64 fast model kernels"
 SRCREV_kernel="0cf25829896330dcf8f95d8484c5f0eae6923f4f"
 PV = "4.1+4.2rc+git${SRCPV}"
 
-SRC_URI_append = " git://git.linaro.org/git/kernel/linux-linaro-tracking.git;protocol=http;name=kernel;nobranch=1 "
-DEPENDS_append_aarch64 = " libgcc"
-KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}"
-KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}"
+SRC_URI:append = " git://git.linaro.org/git/kernel/linux-linaro-tracking.git;protocol=http;name=kernel;nobranch=1 "
+DEPENDS:append:aarch64 = " libgcc"
+KERNEL_CC:append:aarch64 = " ${TOOLCHAIN_OPTIONS}"
+KERNEL_LD:append:aarch64 = " ${TOOLCHAIN_OPTIONS}"
 
 
 include linaro-kernel.inc
@@ -15,7 +15,7 @@ COMPATIBLE_HOST = "aarch64"
 KERNEL_IMAGETYPE = "Image"
 BOOTARGS_COMMON = "console=ttyAMA0 mem=2048M devtmpfs.mount=1 earlyprintk=pl011,0x1c090000 consolelog=9 rw"
 
-do_configure_prepend() {
+do_configure:prepend() {
     . ../ubuntu-ci/configs/vexpress64.cfg
     cd ${S}
     ARCH=arm64 scripts/kconfig/merge_config.sh -m $linaro_base_config_frags $ubuntu_config_frag $board_config_frags
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb b/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb
index 38cbc3f1..9e4bcca7 100644
--- a/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linaro Stable Kernel For Vexpress/KVM"
 
 PV = "3.10+git${SRCPV}"
 SRCREV_kernel="05f74e8baccb60882ace4d0165887368e8143f3f"
-SRC_URI_append = " git://git.linaro.org/git/kernel/linux-linaro-stable.git;protocol=http;branch=linux-linaro-lsk;name=kernel "
+SRC_URI:append = " git://git.linaro.org/git/kernel/linux-linaro-stable.git;protocol=http;branch=linux-linaro-lsk;name=kernel "
 require linaro-kernel.inc
 
 KERNEL_DEVICETREE = "vexpress-v2p-ca15-tc1.dtb"
@@ -10,7 +10,7 @@ BOOTARGS_COMMON = "root=/dev/mmcblk0p2 console=ttyAMA0 consolelog=9 mem=1024M rw
 COMPATIBLE_HOST = "arm.*"
 KERNEL_IMAGETYPE = "zImage"
 
-do_configure_prepend() {
+do_configure:prepend() {
     . ../ubuntu-ci/configs/lsk-vexpress.cfg
     ARCH=arm scripts/kconfig/merge_config.sh -m $linaro_base_config_frags $ubuntu_config_frag $board_config_frags
 }
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb b/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb
index 8c436d7b..6a69bdf0 100644
--- a/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linaro Kernel For Vexpress/KVM"
 
 SRCREV_kernel="0cf25829896330dcf8f95d8484c5f0eae6923f4f"
 PV = "4.1+4.2rc+git${SRCPV}"
-SRC_URI_append = " git://git.linaro.org/git/kernel/linux-linaro-tracking.git;protocol=http;branch=linux-linaro;name=kernel "
+SRC_URI:append = " git://git.linaro.org/git/kernel/linux-linaro-tracking.git;protocol=http;branch=linux-linaro;name=kernel "
 require linaro-kernel.inc
 
 KERNEL_DEVICETREE = "vexpress-v2p-ca15-tc1.dtb"
@@ -10,7 +10,7 @@ BOOTARGS_COMMON = "root=/dev/mmcblk0p2 console=ttyAMA0 consolelog=9 mem=1024M rw
 COMPATIBLE_HOST = "arm.*"
 KERNEL_IMAGETYPE = "zImage"
 
-do_configure_prepend() {
+do_configure:prepend() {
     . ../ubuntu-ci/configs/vexpress.cfg
     ARCH=arm scripts/kconfig/merge_config.sh -m $linaro_base_config_frags $ubuntu_config_frag $board_config_frags
 }
diff --git a/meta-linaro/recipes-kernel/linux/linux.inc b/meta-linaro/recipes-kernel/linux/linux.inc
index 7062e018..0f17f7f7 100644
--- a/meta-linaro/recipes-kernel/linux/linux.inc
+++ b/meta-linaro/recipes-kernel/linux/linux.inc
@@ -11,13 +11,13 @@ inherit kernel siteinfo
 # Set the verbosity of kernel messages during runtime
 # You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
 CMDLINE_DEBUG ?= '${@oe.utils.conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}'
-CMDLINE_append = " ${CMDLINE_DEBUG} "
+CMDLINE:append = " ${CMDLINE_DEBUG} "
 
 # Kernel bootlogo is distro-specific (default is OE logo).
 # Logo resolution (qvga, vga, ...) is machine-specific.
 LOGO_SIZE ?= "."
 
-ALLOW_EMPTY_kernel-devicetree = "1"
+ALLOW_EMPTY:kernel-devicetree = "1"
 
 python __anonymous () {
 
@@ -29,7 +29,7 @@ python __anonymous () {
         d.setVar("DEPENDS", "%s dtc-native" % depends)
 }
 
-do_configure_prepend() {
+do_configure:prepend() {
     if [ -e ${WORKDIR}/defconfig ] ; then
 
         # Rename getline in ./scripts/unifdef.c
@@ -189,7 +189,7 @@ do_configure_prepend() {
     fi
 }
 
-do_configure_append() {
+do_configure:append() {
         if test -e scripts/Makefile.fwinst ; then
             sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
         fi
@@ -199,7 +199,7 @@ do_configure_append() {
 # So explicitly enable it for that in here
 EXTRA_OEMAKE = "${PARALLEL_MAKE} "
 
-do_install_append() {
+do_install:append() {
         oe_runmake firmware_install INSTALL_MOD_PATH=${D} ARCH=$ARCH
         install -d ${D}/boot
         make -C ${S} O=${B} ARCH=$ARCH dtbs || true
@@ -212,11 +212,11 @@ do_install_append() {
 }
 
 PACKAGES =+ "${KERNEL_PACKAGE_NAME}-devicetree-overlays"
-FILES_${KERNEL_PACKAGE_NAME}-devicetree-overlays = "/lib/firmware/*.dtbo /lib/firmware/*.dts"
-FILES_${KERNEL_PACKAGE_NAME}-devicetree += "/boot/*.dtb"
+FILES:${KERNEL_PACKAGE_NAME}-devicetree-overlays = "/lib/firmware/*.dtbo /lib/firmware/*.dts"
+FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/boot/*.dtb"
 
-RDEPENDS_${KERNEL_PACKAGE_NAME}-image_append = " kernel-devicetree"
-RRECOMMENDS_${KERNEL_PACKAGE_NAME}-image_append = " kernel-devicetree-overlays"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-image:append = " kernel-devicetree"
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-image:append = " kernel-devicetree-overlays"
 
 # Automatically depend on lzop/lz4-native if CONFIG_KERNEL_LZO/LZ4 is enabled
 python () {
diff --git a/meta-linaro/recipes-kernel/trace-cmd/kernelshark_2.3.2.bb b/meta-linaro/recipes-kernel/trace-cmd/kernelshark_2.3.2.bb
index dbc2a9d9..1a246727 100644
--- a/meta-linaro/recipes-kernel/trace-cmd/kernelshark_2.3.2.bb
+++ b/meta-linaro/recipes-kernel/trace-cmd/kernelshark_2.3.2.bb
@@ -18,6 +18,6 @@ do_install() {
     rmdir ${D}${libdir}
 }
 
-RDEPENDS_${PN} = "trace-cmd"
+RDEPENDS:${PN} = "trace-cmd"
 
 FILESPATH = "${FILE_DIRNAME}/trace-cmd"
diff --git a/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb b/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb
index 28143b12..d9b17293 100644
--- a/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb
+++ b/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb
@@ -18,4 +18,4 @@ do_install() {
     ${MAKE} NO_PYTHON=1 prefix=${prefix} plugin_dir=${libdir}/trace-cmd/plugins DESTDIR=${D} install
 }
 
-FILES_${PN}-dbg += "${libdir}/trace-cmd/plugins/.debug/"
+FILES:${PN}-dbg += "${libdir}/trace-cmd/plugins/.debug/"
diff --git a/meta-linaro/recipes-linaro/auto-serial-console/auto-serial-console_0.1.bb b/meta-linaro/recipes-linaro/auto-serial-console/auto-serial-console_0.1.bb
index 040c64b1..416e3f87 100644
--- a/meta-linaro/recipes-linaro/auto-serial-console/auto-serial-console_0.1.bb
+++ b/meta-linaro/recipes-linaro/auto-serial-console/auto-serial-console_0.1.bb
@@ -20,9 +20,9 @@ SRC_URI = "\
 "
 
 PACKAGES =+ "auto-console-login"
-RDEPENDS_${PN} = "auto-console-login"
+RDEPENDS:${PN} = "auto-console-login"
 
-FILES_auto-console-login = "\
+FILES:auto-console-login = "\
 	${bindir}/auto-root-login \
 	${sysconfdir}/init.d/auto-console-login \
 "
@@ -30,8 +30,8 @@ FILES_auto-console-login = "\
 S = "${WORKDIR}"
 
 INITSCRIPT_PACKAGES = "${PN} auto-console-login"
-INITSCRIPT_NAME_auto-serial-console = "auto-serial-console"
-INITSCRIPT_NAME_auto-console-login = "auto-console-login"
+INITSCRIPT_NAME:auto-serial-console = "auto-serial-console"
+INITSCRIPT_NAME:auto-console-login = "auto-console-login"
 INITSCRIPT_PARAMS = "start 99 5 ."
 
 do_install () {
diff --git a/meta-linaro/recipes-linaro/files-injection/files-injection.bb b/meta-linaro/recipes-linaro/files-injection/files-injection.bb
index 68b6dcec..9fee75c6 100644
--- a/meta-linaro/recipes-linaro/files-injection/files-injection.bb
+++ b/meta-linaro/recipes-linaro/files-injection/files-injection.bb
@@ -12,7 +12,7 @@ do_install() {
 	cp -a ${S} ${D}/opt/
 }
 
-FILES_${PN} = "/opt"
+FILES:${PN} = "/opt"
 
 # How to use it?
 #
diff --git a/meta-linaro/recipes-linaro/images/linaro-image-common.inc b/meta-linaro/recipes-linaro/images/linaro-image-common.inc
index 1698ddfc..96c32770 100644
--- a/meta-linaro/recipes-linaro/images/linaro-image-common.inc
+++ b/meta-linaro/recipes-linaro/images/linaro-image-common.inc
@@ -2,12 +2,12 @@ inherit core-image
 
 IMAGE_FEATURES += "ssh-server-openssh nfs-server package-management"
 
-HUGETLB_armv7a = "libhugetlbfs-tests"
-HUGETLB_aarch64 = "libhugetlbfs-tests"
+HUGETLB:armv7a = "libhugetlbfs-tests"
+HUGETLB:aarch64 = "libhugetlbfs-tests"
 HUGETLB ?= ""
 
-FWTS_armv7a = ""
-FWTS_armv7ab = ""
+FWTS:armv7a = ""
+FWTS:armv7ab = ""
 FWTS ?= "fwts"
 
 IMAGE_INSTALL += " \
diff --git a/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb b/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb
index 44f3605a..b83e4e22 100644
--- a/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb
+++ b/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb
@@ -12,7 +12,7 @@ IMAGE_INSTALL += " \
     ${SDK_IMAGE_INSTALL}"
 
 # Grub doesn't build for armv7a/hf
-IMAGE_INSTALL_remove_armv7a = "grub"
+IMAGE_INSTALL:remove:armv7a = "grub"
 
 IMAGE_FEATURES += "\
 	dev-pkgs \
diff --git a/meta-linaro/recipes-linaro/images/linaro-image-lng.bb b/meta-linaro/recipes-linaro/images/linaro-image-lng.bb
index 8c53d2a5..c77329b3 100644
--- a/meta-linaro/recipes-linaro/images/linaro-image-lng.bb
+++ b/meta-linaro/recipes-linaro/images/linaro-image-lng.bb
@@ -40,17 +40,17 @@ IMAGE_INSTALL += " \
 IMAGE_INSTALL += "${@bb.utils.contains( \
                   'DISTRO_FEATURES', 'ptest', 'odp-ptest', '', d)}"
 
-IMAGE_INSTALL_append_armv7a = " \
+IMAGE_INSTALL:append:armv7a = " \
     latency-test \
     systemtap \
     trinity-example \
     "
 
-IMAGE_INSTALL_append_aarch64 = " \
+IMAGE_INSTALL:append:aarch64 = " \
     trinity-example \
     "
 
-IMAGE_INSTALL_append_qemux86 = " \
+IMAGE_INSTALL:append:qemux86 = " \
     "
 
 IMAGE_FEATURES += "\
@@ -59,20 +59,20 @@ IMAGE_FEATURES += "\
     tools-debug \
     tools-sdk \
     "
-IMAGE_FSTYPES_append_qemux86 += "cpio.gz qcow2"
-IMAGE_FSTYPES_append_qemux86-64 += "cpio.gz qcow2"
+IMAGE_FSTYPES:append:qemux86 += "cpio.gz qcow2"
+IMAGE_FSTYPES:append:qemux86-64 += "cpio.gz qcow2"
 IMAGE_FSTYPES_lng-x86-64 = "tar.gz cpio.gz"
 IMAGE_FSTYPES_lng-rt-x86-64 = "tar.gz cpio.gz"
 
-EXTRA_IMAGE_FEATURES_append_qemux86 = " autoserial"
+EXTRA_IMAGE_FEATURES:append:qemux86 = " autoserial"
 FEATURE_PACKAGES_autoserial = "auto-serial-console"
 
-IMAGE_PREPROCESS_COMMAND_qemux86 += "qemux86_fixup;"
-IMAGE_PREPROCESS_COMMAND_qemux86-64 += "qemux86_fixup;"
+IMAGE_PREPROCESS_COMMAND:qemux86 += "qemux86_fixup;"
+IMAGE_PREPROCESS_COMMAND:qemux86-64 += "qemux86_fixup;"
 
 qemux86_fixup() {
         # The hostname can be changed by using
-        # hostname_pn-base-files = "linaro"
+        # hostname:pn-base-files = "linaro"
         # See base-files recipe
         echo "linaro" > ${IMAGE_ROOTFS}${sysconfdir}/hostname
 }
diff --git a/meta-linaro/recipes-linaro/linaro-lava-tests/linaro-lava-tests.bb b/meta-linaro/recipes-linaro/linaro-lava-tests/linaro-lava-tests.bb
index 389d2ff4..5729143e 100644
--- a/meta-linaro/recipes-linaro/linaro-lava-tests/linaro-lava-tests.bb
+++ b/meta-linaro/recipes-linaro/linaro-lava-tests/linaro-lava-tests.bb
@@ -19,4 +19,4 @@ do_install() {
     install -m 0644 *.php ${D}/usr/share/apache2/htdocs/
 }
 
-FILES_${PN} = "/"
+FILES:${PN} = "/"
diff --git a/meta-linaro/recipes-support/dnsmasq/dnsmasq_%.bbappend b/meta-linaro/recipes-support/dnsmasq/dnsmasq_%.bbappend
index 4f760116..ba6b4b88 100644
--- a/meta-linaro/recipes-support/dnsmasq/dnsmasq_%.bbappend
+++ b/meta-linaro/recipes-support/dnsmasq/dnsmasq_%.bbappend
@@ -1,3 +1,3 @@
-do_install_prepend() {
+do_install:prepend() {
     sed -i '/^dhcp-range=/d' ${WORKDIR}/dnsmasq.conf
 }
diff --git a/meta-optee/recipes-security/optee/optee-client.bb b/meta-optee/recipes-security/optee/optee-client.bb
index 519683a6..28cd3546 100644
--- a/meta-optee/recipes-security/optee/optee-client.bb
+++ b/meta-optee/recipes-security/optee/optee-client.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 
 SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
 
-SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
+SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
 
 do_install() {
     oe_runmake install
diff --git a/meta-optee/recipes-security/optee/optee-examples.bb b/meta-optee/recipes-security/optee/optee-examples.bb
index 5593f26f..f590c444 100644
--- a/meta-optee/recipes-security/optee/optee-examples.bb
+++ b/meta-optee/recipes-security/optee/optee-examples.bb
@@ -36,7 +36,7 @@ do_install () {
     install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz
 }
 
-FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
 
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-optee/recipes-security/optee/optee-os_git.bb b/meta-optee/recipes-security/optee/optee-os_git.bb
index 872fd48a..581233f9 100644
--- a/meta-optee/recipes-security/optee/optee-os_git.bb
+++ b/meta-optee/recipes-security/optee/optee-os_git.bb
@@ -29,8 +29,8 @@ EXTRA_OEMAKE = "PLATFORM=${OPTEEMACHINE} CFG_ARM64_core=y \
                 LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \
         "
 
-OPTEE_ARCH_armv7a = "arm32"
-OPTEE_ARCH_aarch64 = "arm64"
+OPTEE_ARCH:armv7a = "arm32"
+OPTEE_ARCH:aarch64 = "arm64"
 
 do_compile() {
     unset LDFLAGS
@@ -61,9 +61,9 @@ do_deploy() {
 
 addtask deploy before do_build after do_install
 
-FILES_${PN} = "${nonarch_base_libdir}/firmware/"
-FILES_${PN}-dev = "/usr/include/optee"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/"
+FILES:${PN}-dev = "/usr/include/optee"
 
-INSANE_SKIP_${PN}-dev = "staticdev"
+INSANE_SKIP:${PN}-dev = "staticdev"
 
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/meta-optee/recipes-security/optee/optee-test_git.bb b/meta-optee/recipes-security/optee/optee-test_git.bb
index a6fae9d7..15d66ee8 100644
--- a/meta-optee/recipes-security/optee/optee-test_git.bb
+++ b/meta-optee/recipes-security/optee/optee-test_git.bb
@@ -43,7 +43,7 @@ do_install () {
     install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
 }
 
-FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
 
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"