diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2016-03-22 02:48:20 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-25 10:29:16 +0000 |
| commit | 1b1de893049ac7dabb7f028b1a322082f1b3605c (patch) | |
| tree | d5f0a25aca2f01907ee32392c3ff2b1378901989 /meta/classes/image.bbclass | |
| parent | 4ebaeb281bc70a9962ab9f4c49c0a2587fe3487a (diff) | |
| download | poky-1b1de893049ac7dabb7f028b1a322082f1b3605c.tar.gz | |
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 <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
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 | |||
| 543 | # Some of the vars for vm and live image are conflicted, this function | 543 | # Some of the vars for vm and live image are conflicted, this function |
| 544 | # is used for fixing the problem. | 544 | # is used for fixing the problem. |
| 545 | def set_live_vm_vars(d, suffix): | 545 | def set_live_vm_vars(d, suffix): |
| 546 | vars = ['SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] | 546 | vars = ['GRUB_CFG', 'SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] |
| 547 | for var in vars: | 547 | for var in vars: |
| 548 | var_with_suffix = var + '_' + suffix | 548 | var_with_suffix = var + '_' + suffix |
| 549 | if d.getVar(var, True): | 549 | if d.getVar(var, True): |