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-25 10:29:16 +0000 |
| commit | 4ebaeb281bc70a9962ab9f4c49c0a2587fe3487a (patch) | |
| tree | 9505154827b8f99b1f8279310f8719f145740012 /meta/classes/grub-efi.bbclass | |
| parent | af1f77a1eb9d1dc3de17c9b0a2b74d76ada40544 (diff) | |
| download | poky-4ebaeb281bc70a9962ab9f4c49c0a2587fe3487a.tar.gz | |
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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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" | |||
| 25 | GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" | 25 | GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" |
| 26 | 26 | ||
| 27 | EFIDIR = "/EFI/BOOT" | 27 | EFIDIR = "/EFI/BOOT" |
| 28 | APPEND_prepend = " ${ROOT} " | ||
| 28 | 29 | ||
| 29 | # Need UUID utility code. | 30 | # Need UUID utility code. |
| 30 | inherit fs-uuid | 31 | inherit fs-uuid |