From 001be1911ed4f378bfab3bfe3b544577e4b4483e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Jul 2021 15:16:17 +0100 Subject: [PATCH] arm/generic-arm64: use a custom EFI wic file Instead of using the pre-canned Wic kickstart file, provide our own. This lets us specify that UUIDs should be used in the fstab, meaning that the image is agnostic to the device type. Change-Id: If9c0083c16f8bd2ad7d573a0d356383553aa8936 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/conf/machine/generic-arm64.conf | 4 ++-- meta-arm/wic/efi-disk.wks.in | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 meta-arm/wic/efi-disk.wks.in diff --git a/meta-arm/conf/machine/generic-arm64.conf b/meta-arm/conf/machine/generic-arm64.conf index ca4b8d3b..e3b9ed69 100644 --- a/meta-arm/conf/machine/generic-arm64.conf +++ b/meta-arm/conf/machine/generic-arm64.conf @@ -10,12 +10,12 @@ PREFERRED_VERSION_linux-yocto ?= "5.10%" KERNEL_IMAGETYPE = "Image" -IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" IMAGE_FSTYPES ?= "wic" -WKS_FILE ?= "mkefidisk.wks" +WKS_FILE ?= "efi-disk.wks.in" MACHINE_FEATURES += "efi" +EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" KBUILD_DEFCONFIG = "defconfig" KCONFIG_MODE = "--alldefconfig" diff --git a/meta-arm/wic/efi-disk.wks.in b/meta-arm/wic/efi-disk.wks.in new file mode 100644 index 00000000..1f06830a --- /dev/null +++ b/meta-arm/wic/efi-disk.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"