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/image-vm.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/image-vm.bbclass')
| -rw-r--r-- | meta/classes/image-vm.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ | |||
| 1 | 1 | ||
| 2 | SYSLINUX_LABELS_VM ?= "boot" | 2 | LABELS_VM ?= "boot" |
| 3 | LABELS_VM ?= "${SYSLINUX_LABELS_VM}" | ||
| 4 | 3 | ||
| 5 | # Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. | 4 | # Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. |
| 6 | INITRD_IMAGE_VM ?= "" | 5 | INITRD_IMAGE_VM ?= "" |