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 DAE661FF17A for ; Tue, 28 Oct 2025 13:55:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 949411AA28; Tue, 28 Oct 2025 13:55:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1761656128; x=1762260928; d=canarybit.eu; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=xaU74T9pqdznmoBOCylSg7xpfI4z3RCOTUQ8wMlDKQU=; b=lSxlkz5oZErTozUOqTDgbgVEw8CbEw6W6mH+ruAfzuC3Yz0poKZtJC+2iBRaHyKDGE8TED6s6zVEL /SJBRrDPAOQi5pAEHfIjWwUyXKnAFnBsV68iQRBKtHsmabnui6F1z2iDc+lZZ826GMspwdq4HujXGy +E74lHB0FgNw4GPeRHHiXCS9iBgubMLDlfTCcpT2FWHU7+HeF0YYuIVfhHf69DpToz99gDXR+E/Cop SyhXY6lZ1M+61LJ7tmSL72ss6XFZzzIW1OOT8kBjtGArF+jDnaZe0IlbkbuKUbrXCB9wpc4wscNJnc WcJWFUHZ+ZFUXYrzENQtDZcAM8vpT7g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1761656128; x=1762260928; d=canarybit.eu; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=xaU74T9pqdznmoBOCylSg7xpfI4z3RCOTUQ8wMlDKQU=; b=EAlZ4G0UekxgWTckrEBUyie0rUvZJa0Hj5+4X0YpazMk8Gvmcp+F7v/7237TTpLRKTqHEywgM9kwc TOc5HSvCA== X-HalOne-ID: 602c6dc7-b3fd-11f0-ada3-d510462faafc From: Anton Iacobaeus To: pve-devel@lists.proxmox.com Date: Tue, 28 Oct 2025 13:54:23 +0100 Message-ID: <20251028125459.287308-2-anton.iacobaeus@canarybit.eu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251028125459.287308-1-anton.iacobaeus@canarybit.eu> References: <20251028125459.287308-1-anton.iacobaeus@canarybit.eu> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.800 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_MISSING 0.1 Missing DMARC policy MIME_BASE64_TEXT 1.741 Message text disguised using base64 encoding RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [canarybit.eu] Subject: [pve-devel] [PATCH edk2-firmware v3 1/3] Change name of SEV-related OVMF files X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: Philipp Giersfeld Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" From: Philipp Giersfeld Change variables names to seperate OVMF files from other platforms, such as Intel TDX. Add symlinks for backward compatibility with qemu-server. Signed-off-by: Philipp Giersfeld Signed-off-by: Anton Iacobaeus --- debian/pve-edk2-firmware-ovmf.install | 6 ++-- debian/pve-edk2-firmware-ovmf.links | 3 ++ debian/rules | 40 ++++++++++++++------------- 3 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 debian/pve-edk2-firmware-ovmf.links diff --git a/debian/pve-edk2-firmware-ovmf.install b/debian/pve-edk2-firmware-ovmf.install index a51846e..981ac27 100644 --- a/debian/pve-edk2-firmware-ovmf.install +++ b/debian/pve-edk2-firmware-ovmf.install @@ -1,8 +1,8 @@ debian/ovmf-install/OVMF_CODE*.fd /usr/share/pve-edk2-firmware debian/ovmf-install/OVMF_VARS*.fd /usr/share/pve-edk2-firmware -debian/ovmf-cvm-install/OVMF_CVM_CODE*.fd /usr/share/pve-edk2-firmware -debian/ovmf-cvm-install/OVMF_CVM_VARS*.fd /usr/share/pve-edk2-firmware -debian/ovmf-cvm-install/OVMF_CVM_4M.fd /usr/share/pve-edk2-firmware +debian/ovmf-sev-install/OVMF_SEV_CODE*.fd /usr/share/pve-edk2-firmware +debian/ovmf-sev-install/OVMF_SEV_VARS*.fd /usr/share/pve-edk2-firmware +debian/ovmf-sev-install/OVMF_SEV_4M.fd /usr/share/pve-edk2-firmware debian/ovmf32-install/OVMF32_CODE*.fd /usr/share/pve-edk2-firmware debian/ovmf32-install/OVMF32_VARS*.fd /usr/share/pve-edk2-firmware debian/PkKek-1-snakeoil.* /usr/share/pve-edk2-firmware diff --git a/debian/pve-edk2-firmware-ovmf.links b/debian/pve-edk2-firmware-ovmf.links new file mode 100644 index 0000000..3ffca93 --- /dev/null +++ b/debian/pve-edk2-firmware-ovmf.links @@ -0,0 +1,3 @@ +usr/share/pve-edk2-firmware/OVMF_SEV_CODE_4M.fd usr/share/pve-edk2-firmware/OVMF_CVM_CODE_4M.fd +usr/share/pve-edk2-firmware/OVMF_SEV_VARS_4M.fd usr/share/pve-edk2-firmware/OVMF_CVM_VARS_4M.fd +usr/share/pve-edk2-firmware/OVMF_SEV_4M.fd usr/share/pve-edk2-firmware/OVMF_CVM_4M.fd diff --git a/debian/rules b/debian/rules index 494f162..dd3bf39 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ OVMF_4M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_4MB OVMF_4M_SMM_FLAGS = $(OVMF_4M_FLAGS) -DSMM_REQUIRE=TRUE OVMF32_4M_FLAGS = $(OVMF_COMMON_FLAGS) -DFD_SIZE_4MB OVMF32_4M_SMM_FLAGS = $(OVMF32_4M_FLAGS) -DSMM_REQUIRE=TRUE -OVMF_CVM_4M_FLAGS = $(OVMF_4M_FLAGS) +OVMF_SEV_4M_FLAGS = $(OVMF_4M_FLAGS) AAVMF_FLAGS = $(COMMON_FLAGS) AAVMF_FLAGS += -DTPM2_ENABLE=TRUE @@ -57,7 +57,7 @@ undefine CONF_PATH %: dh $@ -override_dh_auto_build: build-qemu-efi-aarch64 build-ovmf build-ovmf32 build-ovmf-cvm build-qemu-efi-riscv64 +override_dh_auto_build: build-qemu-efi-aarch64 build-ovmf build-ovmf32 build-ovmf-sev build-qemu-efi-riscv64 debian/setup-build-stamp: cp -a debian/Logo.bmp MdeModulePkg/Logo/Logo.bmp @@ -80,11 +80,13 @@ OVMF32_SHELL = $(OVMF32_BUILD_DIR)/IA32/Shell.efi OVMF32_BINARIES = $(OVMF32_SHELL) OVMF32_IMAGES := $(addprefix $(OVMF32_INSTALL_DIR)/,OVMF32_CODE_4M.secboot.fd OVMF32_VARS_4M.fd) -OVMF_CVM_INSTALL_DIR = debian/ovmf-cvm-install -OVMF_CVM_BUILD_DIR = Build/OvmfX64/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) -OVMF_CVM_SHELL = $(OVMF_CVM_BUILD_DIR)/X64/Shell.efi -OVMF_CVM_BINARIES = $(OVMF_CVM_SHELL) -OVMF_CVM_IMAGES := $(addprefix $(OVMF_CVM_INSTALL_DIR)/,OVMF_CVM_CODE_4M.fd OVMF_CVM_VARS_4M.fd) +OVMF_SEV_INSTALL_DIR = debian/ovmf-sev-install +OVMF_SEV_BUILD_DIR = Build/OvmfX64/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) +OVMF_SEV_SHELL = $(OVMF_SEV_BUILD_DIR)/X64/Shell.efi +OVMF_SEV_BINARIES = $(OVMF_SEV_SHELL) +OVMF_SEV_IMAGES := $(addprefix $(OVMF_SEV_INSTALL_DIR)/,OVMF_SEV_CODE_4M.fd OVMF_SEV_VARS_4M.fd OVMF_SEV_4M.fd) +# Note: OVMF_CVM_* are also available via symlinks. Can be removed by next major pve version (PVE 10). +# See pve-edk2-firmware-ovmf.links QEMU_EFI_BUILD_DIR = Build/ArmVirtQemu-$(EDK2_HOST_ARCH)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) AAVMF_BUILD_DIR = Build/ArmVirtQemu-AARCH64/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN) @@ -113,22 +115,22 @@ $(OVMF32_BINARIES) $(OVMF32_IMAGES): debian/setup-build-stamp cp $(OVMF32_BUILD_DIR)/FV/OVMF_VARS.fd \ $(OVMF32_INSTALL_DIR)/OVMF32_VARS_4M.fd -build-ovmf-cvm: $(OVMF_CVM_BINARIES) $(OVMF_CVM_IMAGES) -$(OVMF_CVM_BINARIES) $(OVMF_CVM_IMAGES): debian/setup-build-stamp - rm -rf $(OVMF_CVM_INSTALL_DIR) - mkdir $(OVMF_CVM_INSTALL_DIR) +build-ovmf-sev: $(OVMF_SEV_BINARIES) $(OVMF_SEV_IMAGES) +$(OVMF_SEV_BINARIES) $(OVMF_SEV_IMAGES): debian/setup-build-stamp + rm -rf $(OVMF_SEV_INSTALL_DIR) + mkdir $(OVMF_SEV_INSTALL_DIR) set -e; . ./edksetup.sh; \ build -a X64 \ -t $(EDK2_TOOLCHAIN) \ -p OvmfPkg/OvmfPkgX64.dsc \ - $(OVMF_CVM_4M_FLAGS) -b $(BUILD_TYPE) + $(OVMF_SEV_4M_FLAGS) -b $(BUILD_TYPE) #-b $(BUILD_TYPE) - cp $(OVMF_CVM_BUILD_DIR)/FV/OVMF_CODE.fd \ - $(OVMF_CVM_INSTALL_DIR)/OVMF_CVM_CODE_4M.fd - cp $(OVMF_CVM_BUILD_DIR)/FV/OVMF_VARS.fd \ - $(OVMF_CVM_INSTALL_DIR)/OVMF_CVM_VARS_4M.fd - cp $(OVMF_CVM_BUILD_DIR)/FV/OVMF.fd \ - $(OVMF_CVM_INSTALL_DIR)/OVMF_CVM_4M.fd + cp $(OVMF_SEV_BUILD_DIR)/FV/OVMF_CODE.fd \ + $(OVMF_SEV_INSTALL_DIR)/OVMF_SEV_CODE_4M.fd + cp $(OVMF_SEV_BUILD_DIR)/FV/OVMF_VARS.fd \ + $(OVMF_SEV_INSTALL_DIR)/OVMF_SEV_VARS_4M.fd + cp $(OVMF_SEV_BUILD_DIR)/FV/OVMF.fd \ + $(OVMF_SEV_INSTALL_DIR)/OVMF_SEV_4M.fd build-ovmf: $(OVMF_BINARIES) $(OVMF_IMAGES) $(OVMF_PREENROLLED_VARS) $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp @@ -274,4 +276,4 @@ get-orig-source: edk2-$(DEB_VERSION_UPSTREAM) rm -rf edk2.tmp edk2-$(DEB_VERSION_UPSTREAM) -.PHONY: build-ovmf build-ovmf32 build-ovmf-cvm build-qemu-efi build-qemu-efi-aarch64 build-qemu-efi-riscv64 +.PHONY: build-ovmf build-ovmf32 build-ovmf-sev build-qemu-efi build-qemu-efi-aarch64 build-qemu-efi-riscv64 -- 2.43.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel