From d7d1e0193c94abb1cd2daf1c298c8c1788f3616d Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 22 Mar 2016 02:48:19 -0700 Subject: bootimg.bbclass: fix settings for grub-efi.bbclass Fixed: - Found potential conflicted var LABELS ... Set LABELS to "boot install" would build out broken images when build vm + live together, use set_live_vm_vars() to fix the problem. - Use ROOT and LABEL in boot-directdisk.bbclass and image-foo.bbclass, they are not only used by syslinux.bbclass, but also grub-efi.bbclass, add "SYSLINUX_" prefix would mislead users. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/classes/image-vm.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/classes/image-vm.bbclass') diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 17e87a5a87..8608ec0c11 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass @@ -1,6 +1,5 @@ -SYSLINUX_LABELS_VM ?= "boot" -LABELS_VM ?= "${SYSLINUX_LABELS_VM}" +LABELS_VM ?= "boot" # Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. INITRD_IMAGE_VM ?= "" -- cgit 1.2.3-korg