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

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
meta/classes/image-live.bbclass
+2 -3
View File
@@ -1,9 +1,8 @@
INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
SYSLINUX_ROOT_LIVE ?= "root=/dev/ram0"
SYSLINUX_LABELS_LIVE ?= "boot install"
LABELS_LIVE ?= "${SYSLINUX_LABELS_LIVE}"
ROOT_LIVE ?= "root=/dev/ram0"
LABELS_LIVE ?= "boot install"
SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"