diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-03-22 02:48:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-24 21:44:26 +0000 |
commit | d7d1e0193c94abb1cd2daf1c298c8c1788f3616d (patch) | |
tree | c408a4e1980d42b933d201e31e2a9e7c254b7d8d /meta/classes/grub-efi.bbclass | |
parent | 364f625480dca41d2902e209e4bfb675b1a93dce (diff) | |
download | openembedded-core-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.tar.gz openembedded-core-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.tar.bz2 openembedded-core-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.zip |
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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/grub-efi.bbclass')
-rw-r--r-- | meta/classes/grub-efi.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
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 |