[OE-core] [PATCH 3/3] grub-efi.bbclass: don't use APPEND

[Robert Yang]

For patch 3/3, RP said that changing APPEND may break some other BSP
layers, I will update this patch.

// Robert

On 04/01/2016 05:14 PM, Robert Yang wrote:
> APPEND is a keyword of syslinux, grub should not use it, use GRUB_ROOT
> to instead of it.
>
> [YOCTO #9354]
>
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> ---
>   meta/classes/grub-efi.bbclass | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
> index 3d8ff11..f80a3cc 100644
> --- a/meta/classes/grub-efi.bbclass
> +++ b/meta/classes/grub-efi.bbclass
> @@ -11,9 +11,9 @@
>   # ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional)
>   # ${GRUB_GFXSERIAL} - set this to 1 to have graphics and serial in the boot menu
>   # ${LABELS} - a list of targets for the automatic config
> -# ${APPEND} - an override list of append strings for each label
>   # ${GRUB_OPTS} - additional options to add to the config, ';' delimited # (optional)
>   # ${GRUB_TIMEOUT} - timeout before executing the deault label (optional)
> +# ${GRUB_ROOT} - grub's root device.
>
>   do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy"
>   do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy"
> @@ -26,7 +26,7 @@ GRUB_TIMEOUT ?= "10"
>   GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
>
>   EFIDIR = "/EFI/BOOT"
> -APPEND_prepend = " ${ROOT} "
> +GRUB_ROOT ?= "${ROOT}"
>
>   # Need UUID utility code.
>   inherit fs-uuid
> @@ -131,12 +131,12 @@ python build_efi_cfg() {
>                   lb = "install-efi"
>               cfgfile.write('linux /vmlinuz LABEL=%s' % (lb))
>
> -            append = localdata.getVar('APPEND', True)
> +            root = localdata.getVar('GRUB_ROOT', True)
>               initrd = localdata.getVar('INITRD', True)
>
> -            if append:
> -                append = replace_rootfs_uuid(d, append)
> -                cfgfile.write('%s' % (append))
> +            if root:
> +                root = replace_rootfs_uuid(d, root)
> +                cfgfile.write(' %s' % (root))
>               cfgfile.write(' %s' % btype[1])
>               cfgfile.write('\n')
>
>