summaryrefslogtreecommitdiff
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-03-22 02:48:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-24 21:44:26 +0000
commite38039e43f22d55a443064efa91752e2943fda79 (patch)
tree9446a027668b38f7dc432a440c67f7a6b6bba393 /meta/classes/image.bbclass
parentd7d1e0193c94abb1cd2daf1c298c8c1788f3616d (diff)
downloadopenembedded-core-e38039e43f22d55a443064efa91752e2943fda79.tar.gz
openembedded-core-e38039e43f22d55a443064efa91752e2943fda79.tar.bz2
openembedded-core-e38039e43f22d55a443064efa91752e2943fda79.zip
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 Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
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):