From: ross.burton@arm.com
To: poky@lists.yoctoproject.org
Cc: nd@arm.com
Subject: [PATCH] genericx86*: use common mkefidisk.wks.in
Date: Wed, 15 Nov 2023 17:00:39 +0000 [thread overview]
Message-ID: <20231115170039.486447-1-ross.burton@arm.com> (raw)
From: Ross Burton <ross.burton@arm.com>
There's no real need to use a genericx86*-specific wic file, use the
common mkefidisk.wks.in instead.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
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
next reply other threads:[~2023-11-15 17:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 17:00 ross.burton [this message]
2023-11-15 17:02 ` [poky] [PATCH] genericx86*: use common mkefidisk.wks.in Ross Burton
2023-11-16 8:16 ` Saini, Naveen Kumar
2023-11-16 11:47 ` Ross Burton
2023-11-16 11:53 ` Ross Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231115170039.486447-1-ross.burton@arm.com \
--to=ross.burton@arm.com \
--cc=nd@arm.com \
--cc=poky@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).