[meta-intel] [PATCH 2/2] conf: override WKS_FILE_DEPENDS for intel machines

[Cal Sullivan]

I've noticed a corner case in which this causes a failure.

If you set WKS_FILE = "mkefidisk.wks" manually, grub-efi does not get 
put in the boot partition. To make matters worse, wic does not report an 
error, its just silent.

Thanks,
Cal

On 02/13/2018 03:32 AM, Anuj Mittal wrote:
> WKS_FILE_DEPENDS includes all the dependencies for producing wic images
> and is meant to be overridden with correct set by image recipes. Right now,
> the default values result in grub-efi being built even when EFI_PROVIDER
> is set to systemd-boot.
>
> Change the value to depend only on the EFI_PROVIDER bootloader.
>
> Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
> ---
>   conf/machine/intel-core2-32.conf  | 1 +
>   conf/machine/intel-corei7-64.conf | 1 +
>   2 files changed, 2 insertions(+)
>
> diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
> index aa8a579..c48023c 100644
> --- a/conf/machine/intel-core2-32.conf
> +++ b/conf/machine/intel-core2-32.conf
> @@ -32,3 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
>   
>   IMAGE_FSTYPES += "wic"
>   WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
> +WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}"
> diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
> index 78c52ee..c4ce335 100644
> --- a/conf/machine/intel-corei7-64.conf
> +++ b/conf/machine/intel-corei7-64.conf
> @@ -42,3 +42,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0"
>   
>   IMAGE_FSTYPES += "wic"
>   WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
> +WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}"