From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 24 May 2023 08:45:25 +0000 (+0200)
Subject: fix empty AAVMF_VARS.fd file
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2cfb5323bd54cd360c65869f8142d6fecd3c5c7e;p=pve-edk2-firmware.git

fix empty AAVMF_VARS.fd file

Adapted from:
https://salsa.debian.org/qemu-team/edk2/-/commit/5e68feec5b2f3ddb2c392c2727c252bf51607d02

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/debian/rules b/debian/rules
index 43fa34e..eb0ee89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -208,9 +208,14 @@ build-qemu-efi: debian/setup-build-stamp
 			-t $(EDK2_TOOLCHAIN) \
 			-p ArmVirtPkg/ArmVirtQemu.dsc \
 			$(AAVMF_FLAGS) -b $(BUILD_TYPE)
-	dd if=/dev/zero of=$(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_CODE.fd bs=1M seek=64 count=0
-	dd if=$(QEMU_EFI_BUILD_DIR)/FV/QEMU_EFI.fd of=$(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_CODE.fd conv=notrunc
-	dd if=/dev/zero of=$(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_VARS.fd bs=1M seek=64 count=0
+	cp $(QEMU_EFI_BUILD_DIR)/FV/QEMU_EFI.fd \
+		$(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_CODE.fd
+	cp $(QEMU_EFI_BUILD_DIR)/FV/QEMU_VARS.fd \
+		$(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_VARS.fd
+	# QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures
+	# Truncate the firmware files to the expected size
+	truncate -s 64M $(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_CODE.fd
+	truncate -s 64M $(QEMU_EFI_BUILD_DIR)/FV/$(FW_NAME)_VARS.fd
 
 build-qemu-efi-aarch64: $(AAVMF_BINARIES) $(AAVMF_IMAGES) $(AAVMF_PREENROLLED_VARS)
 $(AAVMF_BINARIES) $(AAVMF_IMAGES): ArmPkg/Library/GccLto/liblto-aarch64.a