[PATCH] genericx86*: use common mkefidisk.wks.in
| Newsgroups | org.yoctoproject.lists.poky |
|---|---|
| Message-ID | <[email protected]> |
From: Ross Burton <[email protected]> There's no real need to use a genericx86*-specific wic file, use the common mkefidisk.wks.in instead. Signed-off-by: Ross Burton <[email protected]> --- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 +--- meta-yocto-bsp/wic/genericx86.wks.in | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 meta-yocto-bsp/wic/genericx86.wks.in diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index e3badebf86d..e0cb7157135 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -21,7 +21,5 @@ GLIBC_ADDONS = "nptl" EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= "genericx86.wks.in" +WKS_FILE ?= "mkefidisk.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.in b/meta-yocto-bsp/wic/genericx86.wks.in deleted file mode 100644 index 7c09ad00a1c..00000000000 --- a/meta-yocto-bsp/wic/genericx86.wks.in +++ /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=${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" -- 2.34.1