mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootimg.bbclass: fix settings for grub-efi.bbclass

Browse Source 
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>
This commit is contained in:
Robert Yang
2016-03-22 02:48:19 -07:00
committed by Richard Purdie
parent af1f77a1eb
commit 4ebaeb281b
7 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/boot-directdisk.bbclass
View File

@@ -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)