From 3925515d989993146a72214db6796dde4b18ecd7 Mon Sep 17 00:00:00 2001 From: Chee Yang Lee Date: Tue, 3 Dec 2019 13:35:58 +0800 Subject: genericx86: wic wks do not hardcode loader replace .wks with .wks.in and refer loader to EFI_PROVIDER to enable different bootloader. soft assign default EFI_PROVIDER "grub-efi" for genericx86. (From meta-yocto rev: 11ecd2febed95e923c8cc68e2c438cd846a88d02) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-yocto-bsp/conf/machine') diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index f83ce5c594..a6c396c79e 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -20,6 +20,7 @@ GLIBC_ADDONS = "nptl" EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= "genericx86.wks" +WKS_FILE ?= "genericx86.wks.in" +EFI_PROVIDER ??= "grub-efi" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" -- cgit v1.2.3-54-g00ecf