diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-03-22 02:48:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-25 10:29:16 +0000 |
commit | 4ebaeb281bc70a9962ab9f4c49c0a2587fe3487a (patch) | |
tree | 9505154827b8f99b1f8279310f8719f145740012 /meta/classes/syslinux.bbclass | |
parent | af1f77a1eb9d1dc3de17c9b0a2b74d76ada40544 (diff) | |
download | poky-4ebaeb281bc70a9962ab9f4c49c0a2587fe3487a.tar.gz |
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 <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/syslinux.bbclass')
-rw-r--r-- | meta/classes/syslinux.bbclass | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 1b644b2561..6de656bc13 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass | |||
@@ -33,23 +33,12 @@ AUTO_SYSLINUXMENU ?= "1" | |||
33 | ISO_BOOTIMG = "isolinux/isolinux.bin" | 33 | ISO_BOOTIMG = "isolinux/isolinux.bin" |
34 | ISO_BOOTCAT = "isolinux/boot.cat" | 34 | ISO_BOOTCAT = "isolinux/boot.cat" |
35 | MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table" | 35 | MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table" |
36 | SYSLINUX_ROOT ?= "${ROOT}" | ||
36 | APPEND_prepend = " ${SYSLINUX_ROOT} " | 37 | APPEND_prepend = " ${SYSLINUX_ROOT} " |
37 | 38 | ||
38 | # Need UUID utility code. | 39 | # Need UUID utility code. |
39 | inherit fs-uuid | 40 | inherit fs-uuid |
40 | 41 | ||
41 | # Some of the vars for vm and live image are conflicted, this function | ||
42 | # is used for fixing the problem. | ||
43 | def syslinux_set_vars(d, suffix): | ||
44 | vars = ['SYSLINUX_ROOT', 'SYSLINUX_CFG', 'LABELS', 'INITRD'] | ||
45 | for var in vars: | ||
46 | var_with_suffix = var + '_' + suffix | ||
47 | if d.getVar(var, True): | ||
48 | bb.warn('Found potential conflicted var %s, please use %s rather than %s' % \ | ||
49 | (var, var_with_suffix, var)) | ||
50 | elif d.getVar(var_with_suffix, True): | ||
51 | d.setVar(var, d.getVar(var_with_suffix, True)) | ||
52 | |||
53 | syslinux_populate() { | 42 | syslinux_populate() { |
54 | DEST=$1 | 43 | DEST=$1 |
55 | BOOTDIR=$2 | 44 | BOOTDIR=$2 |