From 4ebaeb281bc70a9962ab9f4c49c0a2587fe3487a 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. (From OE-Core rev: d7d1e0193c94abb1cd2daf1c298c8c1788f3616d) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/grub-efi.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/classes/grub-efi.bbclass') diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 9a4220abdc..331581d78d 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -25,6 +25,7 @@ GRUB_TIMEOUT ?= "10" GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" EFIDIR = "/EFI/BOOT" +APPEND_prepend = " ${ROOT} " # Need UUID utility code. inherit fs-uuid -- cgit v1.2.3-54-g00ecf