mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

grub-efi.bbclass: make it can build vm and live together

Browse Source 
* 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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2016-03-22 02:48:20 -07:00
committed by Richard Purdie
parent 4ebaeb281b
commit 1b1de89304
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image.bbclass
+1 -1
View File
@@ -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):