Skip to content

Commit 35bfbb7

Browse files
committed
fix: upgrade OVMF to edk2-stable202505 tagged release
Switch from an untagged master branch commit (3a3b12cb, 2024-09-20) to the edk2-stable202505 tagged release. This ensures the UEFI firmware has undergone release-level QA and is tracked by edk2 security advisories. Refresh patches 0003-0005 to apply cleanly against the new base. Partially addresses: #47
1 parent 48dd3df commit 35bfbb7

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

meta-dstack/recipes-core/dstack-ovmf/dstack-ovmf/0003-Debug-prefix-map.patch

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From aa8d288279ef96ffe576a0e434c1d9f435fef1e7 Mon Sep 17 00:00:00 2001
1+
From cab468c477f4a3aa4c82dc97d1b488e351a5ca1f Mon Sep 17 00:00:00 2001
22
From: Kevin Wang <wy721@qq.com>
3-
Date: Mon, 4 Nov 2024 04:29:03 +0000
4-
Subject: [PATCH 3/5] Debug prefix map
3+
Date: Wed, 18 Mar 2026 08:25:21 +0000
4+
Subject: [PATCH] Debug prefix map
55

66
---
77
BaseTools/Conf/tools_def.template | 18 +++++++++---------
88
1 file changed, 9 insertions(+), 9 deletions(-)
99

1010
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
11-
index 0f110fbb4a..35205db748 100755
11+
index cca699c4a8..f3bedcf9d2 100755
1212
--- a/BaseTools/Conf/tools_def.template
1313
+++ b/BaseTools/Conf/tools_def.template
14-
@@ -896,7 +896,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
14+
@@ -920,7 +920,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
1515
*_*_*_DTC_PATH = DEF(DTC_BIN)
1616

1717
# All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64
@@ -20,68 +20,68 @@ index 0f110fbb4a..35205db748 100755
2020
DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global
2121
DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie -mstack-protector-guard=global
2222
DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections
23-
@@ -918,8 +918,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
23+
@@ -941,8 +941,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
2424
DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
2525
DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
2626
DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
2727
-DEFINE GCC_ASM_FLAGS = -c -x assembler -imacros AutoGen.h
2828
-DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h
2929
+DEFINE GCC_ASM_FLAGS = -c -x assembler -imacros AutoGen.h ENV(GCC_PREFIX_MAP)
3030
+DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h ENV(GCC_PREFIX_MAP)
31-
DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
31+
DEFINE GCC_VFRPP_FLAGS = -x c -E -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
3232
DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h
3333
DEFINE GCC_ASLCC_FLAGS = -x c
34-
@@ -1072,7 +1072,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
34+
@@ -1095,7 +1095,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
3535
*_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)
3636
*_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
3737
*_GCC48_IA32_OBJCOPY_FLAGS =
3838
-*_GCC48_IA32_NASM_FLAGS = -f elf32
39-
+*_GCC48_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
39+
+*_GCC48_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
4040

4141
DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)
4242
RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable
43-
@@ -1100,7 +1100,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
43+
@@ -1123,7 +1123,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
4444
*_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)
4545
*_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
4646
*_GCC48_X64_OBJCOPY_FLAGS =
4747
-*_GCC48_X64_NASM_FLAGS = -f elf64
48-
+*_GCC48_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
48+
+*_GCC48_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
4949

5050
DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
5151
RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable
52-
@@ -1209,7 +1209,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
52+
@@ -1232,7 +1232,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
5353
*_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS)
5454
*_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
5555
*_GCC49_IA32_OBJCOPY_FLAGS =
5656
-*_GCC49_IA32_NASM_FLAGS = -f elf32
57-
+*_GCC49_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
57+
+*_GCC49_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
5858

5959
DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS)
6060
RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable
61-
@@ -1237,7 +1237,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
61+
@@ -1260,7 +1260,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
6262
*_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS)
6363
*_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
6464
*_GCC49_X64_OBJCOPY_FLAGS =
6565
-*_GCC49_X64_NASM_FLAGS = -f elf64
66-
+*_GCC49_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
66+
+*_GCC49_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
6767

6868
DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
6969
RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable
70-
@@ -1496,7 +1496,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
70+
@@ -1519,7 +1519,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
7171
*_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie
7272
*_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
7373
*_GCC5_IA32_OBJCOPY_FLAGS =
7474
-*_GCC5_IA32_NASM_FLAGS = -f elf32
75-
+*_GCC5_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
75+
+*_GCC5_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
7676

7777
DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto
7878
DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386
79-
@@ -1528,7 +1528,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
79+
@@ -1551,7 +1551,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
8080
*_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS)
8181
*_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
8282
*_GCC5_X64_OBJCOPY_FLAGS =
8383
-*_GCC5_X64_NASM_FLAGS = -f elf64
84-
+*_GCC5_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
84+
+*_GCC5_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
8585

8686
DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO
8787
DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os

meta-dstack/recipes-core/dstack-ovmf/dstack-ovmf/0004-Reproduciable.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 81fc61513cf51a9ef6947dcf4bc1388a50c13f42 Mon Sep 17 00:00:00 2001
1+
From 6314aebda7b3ad4cf6fbdbc0d383752afa8e8e41 Mon Sep 17 00:00:00 2001
22
From: Kevin Wang <wy721@qq.com>
3-
Date: Mon, 4 Nov 2024 04:29:41 +0000
4-
Subject: [PATCH 4/5] Reproduciable
3+
Date: Wed, 18 Mar 2026 08:33:34 +0000
4+
Subject: [PATCH] Reproduciable
55

66
---
77
BaseTools/Source/C/GenFw/Elf64Convert.c | 8 ++++---
@@ -11,19 +11,19 @@ Subject: [PATCH 4/5] Reproduciable
1111
4 files changed, 24 insertions(+), 16 deletions(-)
1212

1313
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
14-
index 9d04fc612e..83fd6c9c05 100644
14+
index 6919e18809..f6696ae805 100644
1515
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
1616
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
17-
@@ -13,6 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
18-
#ifndef __GNUC__
17+
@@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
1918
#include <windows.h>
19+
#undef RUNTIME_FUNCTION
2020
#include <io.h>
2121
+#else
2222
+#define _GNU_SOURCE
2323
#endif
2424
#include <assert.h>
2525
#include <stdio.h>
26-
@@ -988,7 +990,7 @@ ScanSections64 (
26+
@@ -990,7 +992,7 @@ ScanSections64 (
2727
}
2828
mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) +
2929
sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +
@@ -32,7 +32,7 @@ index 9d04fc612e..83fd6c9c05 100644
3232

3333
//
3434
// Add more space in the .debug data region for the DllCharacteristicsEx
35-
@@ -2299,7 +2301,7 @@ WriteDebug64 (
35+
@@ -2310,7 +2312,7 @@ WriteDebug64 (
3636
EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
3737
EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry;
3838

@@ -41,7 +41,7 @@ index 9d04fc612e..83fd6c9c05 100644
4141

4242
NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
4343
DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];
44-
@@ -2332,7 +2334,7 @@ WriteDebug64 (
44+
@@ -2343,7 +2345,7 @@ WriteDebug64 (
4545

4646
Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);
4747
Nb10->Signature = CODEVIEW_SIGNATURE_NB10;
@@ -65,7 +65,7 @@ index 45b39d7878..3fed7d1736 100644
6565
if Input not in self.Inputs:
6666
self.Inputs.append(Input)
6767
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
68-
index 6d9c60b702..83ac267647 100755
68+
index 547c708fc7..29859c4a0b 100755
6969
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
7070
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
7171
@@ -576,7 +576,7 @@ cleanlib:
@@ -116,7 +116,7 @@ index 6d9c60b702..83ac267647 100755
116116
}
117117

118118
RespDict = {}
119-
@@ -1008,9 +1008,9 @@ cleanlib:
119+
@@ -1019,9 +1019,9 @@ cleanlib:
120120
if not self.ObjTargetDict.get(T.Target.SubDir):
121121
self.ObjTargetDict[T.Target.SubDir] = set()
122122
self.ObjTargetDict[T.Target.SubDir].add(NewFile)

meta-dstack/recipes-core/dstack-ovmf/dstack-ovmf/0005-Declare-ProcessLibraryConstructorList.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 596f2e3bd7292c8f22cfe01ec95b8b46ce1bc8a1 Mon Sep 17 00:00:00 2001
1+
From 0548d460eb8259b7476586acfcb14169bb426859 Mon Sep 17 00:00:00 2001
22
From: Kevin Wang <wy721@qq.com>
3-
Date: Mon, 4 Nov 2024 04:35:18 +0000
3+
Date: Wed, 18 Mar 2026 08:33:35 +0000
44
Subject: [PATCH] Declare ProcessLibraryConstructorList
55

66
---

meta-dstack/recipes-core/dstack-ovmf/dstack-ovmf_git.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
2727
file://0005-Declare-ProcessLibraryConstructorList.patch \
2828
"
2929

30-
PV = "edk2-3a3b12cb"
31-
SRCREV = "3a3b12cbdae2e89b0e365eb01c378891d0d9037c"
30+
PV = "edk2-stable202505"
31+
SRCREV = "6951dfe7d59d144a3a980bd7eda699db2d8554ac"
3232
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
3333

3434
CVE_PRODUCT = "edk2"

0 commit comments

Comments
 (0)