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-24 21:44:26 +0000 |
| commit | d7d1e0193c94abb1cd2daf1c298c8c1788f3616d (patch) | |
| tree | c408a4e1980d42b933d201e31e2a9e7c254b7d8d /meta/classes/boot-directdisk.bbclass | |
| parent | 364f625480dca41d2902e209e4bfb675b1a93dce (diff) | |
| download | openembedded-core-contrib-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index fcdef26fd8..c6ada47479 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -58,8 +58,8 @@ inherit ${PCBIOS_CLASS} inherit ${EFI_CLASS} DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" -SYSLINUX_ROOT_VM ?= "root=/dev/sda2" -SYSLINUX_CFG_VM ?= "${S}/syslinux_hdd.cfg" +ROOT_VM ?= "root=/dev/sda2" +SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg" boot_direct_populate() { dest=$1 @@ -160,8 +160,8 @@ build_boot_dd() { python do_bootdirectdisk() { validate_disk_signature(d) + set_live_vm_vars(d, 'VM') if d.getVar("PCBIOS", True) == "1": - syslinux_set_vars(d, 'VM') bb.build.exec_func('build_syslinux_cfg', d) if d.getVar("EFI", True) == "1": bb.build.exec_func('build_efi_cfg', d) |