From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 374721FF13B for ; Wed, 20 May 2026 16:21:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B73CBBCB4; Wed, 20 May 2026 16:20:54 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH edk2-firmware 1/4] d/rules: use dedicated install dir for AAVMF build Date: Wed, 20 May 2026 16:20:32 +0200 Message-ID: <20260520142044.502304-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260520142044.502304-1-f.ebner@proxmox.com> References: <20260520142044.502304-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1779286832034 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record UPPERCASE_50_75 0.008 message body is 50-75% uppercase Message-ID-Hash: F3GXXYY7XHE5UMBJHQ552TQOEKZNXT7G X-Message-ID-Hash: F3GXXYY7XHE5UMBJHQ552TQOEKZNXT7G X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Better aligns it with the x86 builds and in preparation for adding a secureboot CODE image, which requires a secondary build, so moving the build targets out of the way. Signed-off-by: Fiona Ebner --- debian/rules | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/rules b/debian/rules index 044071cf90..90a4f6a5cc 100755 --- a/debian/rules +++ b/debian/rules @@ -102,15 +102,14 @@ OVMF_TDX_PREENROLLED_IMAGES := $(addprefix $(OVMF_TDX_INSTALL_DIR)/,OVMF_TDX_4M. QEMU_EFI_BUILD_ROOT = Build/ArmVirtQemu-$(EDK2_HOST_ARCH) QEMU_EFI_BUILD_DIR = $(QEMU_EFI_BUILD_ROOT)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) +AAVMF_INSTALL_DIR = debian/aavmf-install AAVMF_BUILD_ROOT = Build/ArmVirtQemu-AARCH64 AAVMF_BUILD_DIR = $(AAVMF_BUILD_ROOT)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) AAVMF_ENROLL = $(AAVMF_BUILD_DIR)/AARCH64/EnrollDefaultKeys.efi AAVMF_SHELL = $(AAVMF_BUILD_DIR)/AARCH64/Shell.efi AAVMF_BINARIES = $(AAVMF_ENROLL) $(AAVMF_SHELL) -AAVMF_CODE = $(AAVMF_BUILD_DIR)/FV/AAVMF_CODE.fd -AAVMF_VARS = $(AAVMF_BUILD_DIR)/FV/AAVMF_VARS.fd -AAVMF_IMAGES = $(AAVMF_CODE) $(AAVMF_VARS) -AAVMF_PREENROLLED_VARS = $(addprefix $(AAVMF_BUILD_DIR)/FV/,AAVMF_VARS.ms.fd AAVMF_VARS.snakeoil.fd) +AAVMF_IMAGES = $(addprefix $(AAVMF_INSTALL_DIR)/,AAVMF_CODE.fd AAVMF_VARS.fd) +AAVMF_PREENROLLED_VARS = $(addprefix $(AAVMF_INSTALL_DIR)/,AAVMF_VARS.ms.fd AAVMF_VARS.snakeoil.fd) RISCV64_BUILD_ROOT = Build/RiscVVirtQemu RISCV64_BUILD_DIR = $(RISCV64_BUILD_ROOT)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) @@ -203,10 +202,10 @@ enroll_snakeoil = virt-fw-vars --input $(1) --output $(2) \ debian/PkKek-1-snakeoil.pem %/AAVMF_VARS.ms.fd: %/AAVMF_CODE.fd %/AAVMF_VARS.fd debian/PkKek-1-vendor.pem $(AAVMF_ENROLL) $(AAVMF_SHELL) - $(call enroll_vendor,$(AAVMF_VARS),$@,arm64) + $(call enroll_vendor,$(AAVMF_INSTALL_DIR)/AAVMF_VARS.fd,$@,arm64) %/AAVMF_VARS.snakeoil.fd: %/AAVMF_CODE.fd %/AAVMF_VARS.fd debian/PkKek-1-snakeoil.pem $(AAVMF_ENROLL) $(AAVMF_SHELL) - $(call enroll_snakeoil,$(AAVMF_VARS),$@) + $(call enroll_snakeoil,$(AAVMF_INSTALL_DIR)/AAVMF_VARS.fd,$@) %/OVMF_VARS.ms.fd: %/OVMF_CODE.secboot.fd %/OVMF_VARS.fd debian/PkKek-1-vendor.pem $(OVMF_ENROLL) $(OVMF_SHELL) $(call enroll_vendor,$(OVMF_INSTALL_DIR)/OVMF_VARS.fd,$@,amd64) @@ -227,23 +226,25 @@ BaseTools/Bin/GccLto/liblto-arm.a: BaseTools/Bin/GccLto/liblto-arm.s $($(EDK2_TOOLCHAIN)_ARM_PREFIX)gcc -c -fpic $< -o $@ build-qemu-efi: debian/setup-build-stamp + rm -rf $(QEMU_EFI_INSTALL_DIR) + mkdir $(QEMU_EFI_INSTALL_DIR) set -e; . ./edksetup.sh; \ build -a $(EDK2_HOST_ARCH) \ -t $(EDK2_TOOLCHAIN) \ -p ArmVirtPkg/ArmVirtQemu.dsc \ $(AAVMF_FLAGS) -b $(BUILD_TYPE) - 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 + truncate -s 64M $(QEMU_EFI_BUILD_DIR)/FV/QEMU_EFI.fd + truncate -s 64M $(QEMU_EFI_BUILD_DIR)/FV/QEMU_VARS.fd + cp $(QEMU_EFI_BUILD_DIR)/FV/QEMU_EFI.fd \ + $(QEMU_EFI_INSTALL_DIR)/$(FW_NAME)_CODE.fd + cp $(QEMU_EFI_BUILD_DIR)/FV/QEMU_VARS.fd \ + $(QEMU_EFI_INSTALL_DIR)/$(FW_NAME)_VARS.fd build-qemu-efi-aarch64: $(AAVMF_BINARIES) $(AAVMF_IMAGES) $(AAVMF_PREENROLLED_VARS) $(AAVMF_BINARIES) $(AAVMF_IMAGES): BaseTools/Bin/GccLto/liblto-aarch64.a - $(MAKE) -f debian/rules build-qemu-efi EDK2_ARCH_DIR=AArch64 EDK2_HOST_ARCH=AARCH64 FW_NAME=AAVMF + $(MAKE) -f debian/rules build-qemu-efi EDK2_ARCH_DIR=AArch64 EDK2_HOST_ARCH=AARCH64 FW_NAME=AAVMF QEMU_EFI_INSTALL_DIR=$(AAVMF_INSTALL_DIR) build-qemu-efi-riscv64: $(RISCV64_IMAGES) $(RISCV64_IMAGES): debian/setup-build-stamp -- 2.47.3