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/image-live.bbclass | |
| parent | 364f625480dca41d2902e209e4bfb675b1a93dce (diff) | |
| download | openembedded-core-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.tar.gz openembedded-core-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.tar.bz2 openembedded-core-d7d1e0193c94abb1cd2daf1c298c8c1788f3616d.zip | |
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/image-live.bbclass')
| -rw-r--r-- | meta/classes/image-live.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index b8f21cb7a5..504725d266 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -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" |