summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChee Yang Lee <chee.yang.lee@intel.com>2019-12-03 13:35:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:04:15 +0000
commit11ecd2febed95e923c8cc68e2c438cd846a88d02 (patch)
treeb1674b9288341ea2c8e6ab5e1f0358917e42172e
parent6ab7787509170d9d7c874096c56d47d6ce81cda9 (diff)
downloadmeta-yocto-11ecd2febed95e923c8cc68e2c438cd846a88d02.tar.gz
meta-yocto-11ecd2febed95e923c8cc68e2c438cd846a88d02.tar.bz2
meta-yocto-11ecd2febed95e923c8cc68e2c438cd846a88d02.zip
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. Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc3
-rw-r--r--meta-yocto-bsp/wic/genericx86.wks.in (renamed from meta-yocto-bsp/wic/genericx86.wks)2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index f83ce5c..a6c396c 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"
diff --git a/meta-yocto-bsp/wic/genericx86.wks b/meta-yocto-bsp/wic/genericx86.wks.in
index dab719c..7c09ad0 100644
--- a/meta-yocto-bsp/wic/genericx86.wks
+++ b/meta-yocto-bsp/wic/genericx86.wks.in
@@ -1,6 +1,6 @@
# short-description: Create an EFI disk image for genericx86*
# long-description: Creates a partitioned EFI disk image for genericx86* machines
-part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024
+part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos --active --align 1024
part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
part swap --ondisk sda --size 44 --label swap1 --fstype=swap