From: Philipp Giersfeld <[email protected]> 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 <[email protected]> Signed-off-by: Anton Iacobaeus <[email protected]> --- 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 [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
