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/bootimg.bbclass | |
| parent | 364f625480dca41d2902e209e4bfb675b1a93dce (diff) | |
| download | openembedded-core-contrib-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/bootimg.bbclass')
| -rw-r--r-- | meta/classes/bootimg.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 0249a9dcf7..70ce07032b 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -49,8 +49,6 @@ EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", KERNEL_IMAGETYPE ??= "bzImage" -LABELS ?= "boot install" - # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not # contain "efi". This way legacy is supported by default if neither is # specified, maintaining the original behavior. @@ -282,8 +280,8 @@ build_hddimg() { } python do_bootimg() { + set_live_vm_vars(d, 'LIVE') if d.getVar("PCBIOS", True) == "1": - syslinux_set_vars(d, 'LIVE') bb.build.exec_func('build_syslinux_cfg', d) if d.getVar("EFI", True) == "1": bb.build.exec_func('build_efi_cfg', d) |