]> code.ossystems Code Review - openembedded-core.git/commit
bootimg.bbclass: fix settings for grub-efi.bbclass
authorRobert Yang <liezhi.yang@windriver.com>
Tue, 22 Mar 2016 09:48:19 +0000 (02:48 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 24 Mar 2016 21:44:26 +0000 (21:44 +0000)
commitd7d1e0193c94abb1cd2daf1c298c8c1788f3616d
treec408a4e1980d42b933d201e31e2a9e7c254b7d8d
parent364f625480dca41d2902e209e4bfb675b1a93dce
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>
meta/classes/boot-directdisk.bbclass
meta/classes/bootimg.bbclass
meta/classes/grub-efi.bbclass
meta/classes/image-live.bbclass
meta/classes/image-vm.bbclass
meta/classes/image.bbclass
meta/classes/syslinux.bbclass