From 1b1de893049ac7dabb7f028b1a322082f1b3605c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 22 Mar 2016 02:48:20 -0700 Subject: grub-efi.bbclass: make it can build vm and live together * Make it can build vm and live (e.g., iso + vmdk) together as we did for syslinux. * GRUBCFG -> GRUB_CFG as other GRUB_FOO vars (From OE-Core rev: e38039e43f22d55a443064efa91752e2943fda79) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 560cc6d894..0249f77bcf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -543,7 +543,7 @@ addtask bundle_initramfs after do_image_complete # Some of the vars for vm and live image are conflicted, this function # is used for fixing the problem. def set_live_vm_vars(d, suffix): - vars = ['SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] + vars = ['GRUB_CFG', 'SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] for var in vars: var_with_suffix = var + '_' + suffix if d.getVar(var, True): -- cgit v1.2.3-54-g00ecf