From patchwork Wed Nov 15 17:00:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 34653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6DDBC2BB3F for ; Wed, 15 Nov 2023 17:00:27 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.18572.1700067624475571952 for ; Wed, 15 Nov 2023 09:00:24 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36E04DA7; Wed, 15 Nov 2023 09:01:09 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1B9373F641; Wed, 15 Nov 2023 09:00:23 -0800 (PST) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH] canned-wks/mkefidisk.wks: generalise wic image Date: Wed, 15 Nov 2023 17:00:19 +0000 Message-Id: <20231115170019.486387-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 15 Nov 2023 17:00:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190737 From: Ross Burton Update this wic image to be more generalised: - Use ${EFI_PROVIDER} instead of hard-coding grub-efi - Don't set the console explicitly, the kernel can set that up - Use generic partition names "boot" and "root" instead of "msdos" and "platform" - Use UUIDs for more mounts Signed-off-by: Ross Burton --- scripts/lib/wic/canned-wks/mkefidisk.wks | 11 ----------- scripts/lib/wic/canned-wks/mkefidisk.wks.in | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 scripts/lib/wic/canned-wks/mkefidisk.wks create mode 100644 scripts/lib/wic/canned-wks/mkefidisk.wks.in diff --git a/scripts/lib/wic/canned-wks/mkefidisk.wks b/scripts/lib/wic/canned-wks/mkefidisk.wks deleted file mode 100644 index 9f534fe1847..00000000000 --- a/scripts/lib/wic/canned-wks/mkefidisk.wks +++ /dev/null @@ -1,11 +0,0 @@ -# short-description: Create an EFI disk image -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. - -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/scripts/lib/wic/canned-wks/mkefidisk.wks.in b/scripts/lib/wic/canned-wks/mkefidisk.wks.in new file mode 100644 index 00000000000..1f06830a5fc --- /dev/null +++ b/scripts/lib/wic/canned-wks/mkefidisk.wks.in @@ -0,0 +1,11 @@ +# short-description: Create an EFI disk image +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. + +part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --label boot --active --align 1024 --use-uuid + +part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid + +part swap --size 44 --label swap --fstype=swap --use-uuid + +bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4"