* [pve-devel] [PATCH edk2-firmware] fix #4625: restore SMBIOS type 0 table defaults
@ 2023-03-29 12:26 Fiona Ebner
0 siblings, 0 replies; only message in thread
From: Fiona Ebner @ 2023-03-29 12:26 UTC (permalink / raw)
To: pve-devel
Commit 4cb94f20b0 ("OvmfPkg/SmbiosPlatformDxe: use PcdFirmware*") in
the edk2 submodule made the switch from hard coded values for the
SMBIOS type 0 table to using those defined in the PCD (Platform
Configuration Database). But this changed the value for the vendor
from "EFI Development Kit II / OVMF" to "EDK II" and made version and
release date "unknown". This can cause problems for hardware keys[0],
and the missing date can make Windows unhappy[1]. Just revert to the
hardcoded values from before, but do it by specifing them for the PCD
during build.
[0]: https://bugzilla.proxmox.com/show_bug.cgi?id=4625
[1]: https://edk2.groups.io/g/devel/message/100922
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
debian/rules | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/debian/rules b/debian/rules
index acd304d..5c3737f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,10 @@ OVMF32_4M_SMM_FLAGS = $(OVMF32_4M_FLAGS) -DSMM_REQUIRE=TRUE
AAVMF_FLAGS = $(COMMON_FLAGS) -DTPM2_CONFIG_ENABLE=TRUE
AAVMF_FLAGS += -DCAVIUM_ERRATUM_27456=TRUE
+PCD_OPTIONS = --pcd PcdFirmwareVendor=L'EFI Development Kit II / OVMF'
+PCD_OPTIONS += --pcd PcdFirmwareVersionString=L'0.0.0'
+PCD_OPTIONS += --pcd PcdFirmwareReleaseDateString=L'02/06/2015'
+
# Clear variables used internally by the edk2 build system
undefine WORKSPACE
undefine ECP_SOURCE
@@ -89,6 +93,7 @@ $(OVMF32_BINARIES) $(OVMF32_IMAGES): debian/setup-build-stamp
build -a IA32 \
-t $(EDK2_TOOLCHAIN) \
-p OvmfPkg/OvmfPkgIa32.dsc \
+ $(PCD_OPTIONS) \
$(OVMF32_4M_SMM_FLAGS) -b $(BUILD_TYPE)
cp $(OVMF32_BUILD_DIR)/FV/OVMF_CODE.fd \
$(OVMF32_INSTALL_DIR)/OVMF32_CODE_4M.secboot.fd
@@ -103,6 +108,7 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
build -a X64 \
-t $(EDK2_TOOLCHAIN) \
-p OvmfPkg/OvmfPkgX64.dsc \
+ $(PCD_OPTIONS) \
$(OVMF_2M_FLAGS) -b $(BUILD_TYPE)
cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \
$(OVMF_BUILD_DIR)/FV/OVMF.fd $(OVMF_INSTALL_DIR)/
@@ -112,6 +118,7 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
build -a IA32 -a X64 \
-t $(EDK2_TOOLCHAIN) \
-p OvmfPkg/OvmfPkgIa32X64.dsc \
+ $(PCD_OPTIONS) \
$(OVMF_4M_FLAGS) -b $(BUILD_TYPE)
cp $(OVMF3264_BUILD_DIR)/FV/OVMF_CODE.fd \
$(OVMF_INSTALL_DIR)/OVMF_CODE_4M.fd
@@ -122,6 +129,7 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
build -a X64 \
-t $(EDK2_TOOLCHAIN) \
-p OvmfPkg/OvmfPkgX64.dsc \
+ $(PCD_OPTIONS) \
$(OVMF_2M_SMM_FLAGS) -b $(BUILD_TYPE)
cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \
$(OVMF_INSTALL_DIR)/OVMF_CODE.secboot.fd
@@ -130,6 +138,7 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
build -a IA32 -a X64 \
-t $(EDK2_TOOLCHAIN) \
-p OvmfPkg/OvmfPkgIa32X64.dsc \
+ $(PCD_OPTIONS) \
$(OVMF_4M_SMM_FLAGS) -b $(BUILD_TYPE)
cp $(OVMF3264_BUILD_DIR)/FV/OVMF_CODE.fd \
$(OVMF_INSTALL_DIR)/OVMF_CODE_4M.secboot.fd
--
2.30.2
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-29 12:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-29 12:26 [pve-devel] [PATCH edk2-firmware] fix #4625: restore SMBIOS type 0 table defaults Fiona Ebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox