4 files changed, 5 insertions, 5 deletions
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"