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 ++- meta-yocto-bsp/wic/genericx86.wks | 7 ------- meta-yocto-bsp/wic/genericx86.wks.in | 7 +++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 meta-yocto-bsp/wic/genericx86.wks create mode 100644 meta-yocto-bsp/wic/genericx86.wks.in (limited to 'meta-yocto-bsp') 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" diff --git a/meta-yocto-bsp/wic/genericx86.wks b/meta-yocto-bsp/wic/genericx86.wks deleted file mode 100644 index dab719c584..0000000000 --- a/meta-yocto-bsp/wic/genericx86.wks +++ /dev/null @@ -1,7 +0,0 @@ -# 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 / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid -part swap --ondisk sda --size 44 --label swap1 --fstype=swap - -bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0" diff --git a/meta-yocto-bsp/wic/genericx86.wks.in b/meta-yocto-bsp/wic/genericx86.wks.in new file mode 100644 index 0000000000..7c09ad00a1 --- /dev/null +++ b/meta-yocto-bsp/wic/genericx86.wks.in @@ -0,0 +1,7 @@ +# 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=${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 + +bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0" -- cgit v1.2.3-54-g00ecf