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 7D9C11FF13B for ; Wed, 20 May 2026 16:21:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C0C0CBF7F; Wed, 20 May 2026 16:21:22 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH edk2-firmware 2/4] d/{rules,install}: build secureboot-enabled image for aarch64 Date: Wed, 20 May 2026 16:20:33 +0200 Message-ID: <20260520142044.502304-3-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: 1779286832134 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 Message-ID-Hash: XNKFI2EPCTACCV5U57HZJGN7TU6XAWLP X-Message-ID-Hash: XNKFI2EPCTACCV5U57HZJGN7TU6XAWLP 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: Previously, a second copy of the CODE image was shipped as /usr/share/pve-edk2-firmware/aarch64/QEMU_EFI.fd, but this is not used by qemu-server and it was not yet expanded to 64MiB so it is wouldn't even have worked with QEMU. Just drop it. The BUILD_SHELL=FALSE flag is added for completeness. Not including the shell is already guarded by edk2 commit f881b4d129 ("OvmfPkg: only add shell to FV in case secure boot is disabled"), but it doesn't hurt to be explicit and Debian does it too. Signed-off-by: Fiona Ebner --- debian/pve-edk2-firmware-aarch64.install | 4 ++-- debian/rules | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/pve-edk2-firmware-aarch64.install b/debian/pve-edk2-firmware-aarch64.install index 22cb9eef27..dea6fc9fb3 100644 --- a/debian/pve-edk2-firmware-aarch64.install +++ b/debian/pve-edk2-firmware-aarch64.install @@ -1,2 +1,2 @@ -Build/ArmVirtQemu-AARCH64/RELEASE_*GCC*/FV/QEMU_EFI.fd /usr/share/pve-edk2-firmware/aarch64 -Build/ArmVirtQemu-AARCH64/RELEASE_*GCC*/FV/AAVMF_*.fd /usr/share/pve-edk2-firmware +debian/aavmf-install/AAVMF_CODE*.fd /usr/share/pve-edk2-firmware +debian/aavmf-install/AAVMF_VARS*.fd /usr/share/pve-edk2-firmware diff --git a/debian/rules b/debian/rules index 90a4f6a5cc..8abc6a7d70 100755 --- a/debian/rules +++ b/debian/rules @@ -44,6 +44,7 @@ AAVMF_FLAGS = $(COMMON_FLAGS) AAVMF_FLAGS += -DTPM2_ENABLE=TRUE AAVMF_FLAGS += -DTPM2_CONFIG_ENABLE=TRUE AAVMF_FLAGS += -DCAVIUM_ERRATUM_27456=TRUE +AAVMF_SECBOOT_FLAGS = $(AAVMF_FLAGS) -DBUILD_SHELL=FALSE -DSECURE_BOOT_ENABLE=TRUE RISCV64_FLAGS = $(COMMON_FLAGS) @@ -108,7 +109,7 @@ 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_IMAGES = $(addprefix $(AAVMF_INSTALL_DIR)/,AAVMF_CODE.fd AAVMF_VARS.fd) +AAVMF_IMAGES = $(addprefix $(AAVMF_INSTALL_DIR)/,AAVMF_CODE.fd AAVMF_CODE.secboot.fd AAVMF_VARS.fd) AAVMF_PREENROLLED_VARS = $(addprefix $(AAVMF_INSTALL_DIR)/,AAVMF_VARS.ms.fd AAVMF_VARS.snakeoil.fd) RISCV64_BUILD_ROOT = Build/RiscVVirtQemu @@ -201,7 +202,7 @@ enroll_snakeoil = virt-fw-vars --input $(1) --output $(2) \ --add-db OvmfEnrollDefaultKeys \ debian/PkKek-1-snakeoil.pem -%/AAVMF_VARS.ms.fd: %/AAVMF_CODE.fd %/AAVMF_VARS.fd debian/PkKek-1-vendor.pem $(AAVMF_ENROLL) $(AAVMF_SHELL) +%/AAVMF_VARS.ms.fd: %/AAVMF_CODE.secboot.fd %/AAVMF_VARS.fd debian/PkKek-1-vendor.pem $(AAVMF_ENROLL) $(AAVMF_SHELL) $(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) @@ -241,6 +242,15 @@ build-qemu-efi: debian/setup-build-stamp $(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 + rm -rf $(QEMU_EFI_BUILD_ROOT) + set -e; . ./edksetup.sh; \ + build -a $(EDK2_HOST_ARCH) \ + -t $(EDK2_TOOLCHAIN) \ + -p ArmVirtPkg/ArmVirtQemu.dsc \ + $(AAVMF_SECBOOT_FLAGS) -b $(BUILD_TYPE) + truncate -s 64M $(QEMU_EFI_BUILD_DIR)/FV/QEMU_EFI.fd + cp $(QEMU_EFI_BUILD_DIR)/FV/QEMU_EFI.fd \ + $(QEMU_EFI_INSTALL_DIR)/$(FW_NAME)_CODE.secboot.fd build-qemu-efi-aarch64: $(AAVMF_BINARIES) $(AAVMF_IMAGES) $(AAVMF_PREENROLLED_VARS) $(AAVMF_BINARIES) $(AAVMF_IMAGES): BaseTools/Bin/GccLto/liblto-aarch64.a -- 2.47.3