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/bootimg.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/classes/bootimg.bbclass') 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) -- cgit v1.2.3-54-g00ecf