From patchwork Fri May 15 13:20:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 88170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11308CD4F52 for ; Fri, 15 May 2026 13:20:34 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.34758.1778851228697435451 for ; Fri, 15 May 2026 06:20:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=uYy2Rp9c; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=C4AgrIWj; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 0101019e2bcba9f3-eb1c7f6e-cd83-4a2e-85ee-7cd657b6ac5d-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1778851228; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=f+yIURjRvZ2wmWdej8KPVrcQCwz4HVqIVEPmCBO8sF0=; b=uYy2Rp9co52lQDMzgECuiGAxu0T34zYu5D0Tnk3Mkaco4Gzoy6FEkSSmgqQvHk60 EDAKLti6t9aC/HyKSf8JZYwjS8+HtB70F/1xmVj1pV4SNzLUA8v3hN1VLwRvT2u96tQ rQM8FjL8OIxSPj3KdFT8SdYybOZ1XvXTWZQgJuHk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1778851228; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=f+yIURjRvZ2wmWdej8KPVrcQCwz4HVqIVEPmCBO8sF0=; b=C4AgrIWjq5I5Fdlv69GLus+av95w4JGN+NeiG/IRWE+lz/IJ5hJuShSDCsInHNdT 3bTdbQcRNDApoDiSMHYT2n2ndTgmtW0GQFcYQFf6FaCCym0hell87Ur0vhCBzfN/jI+ W1s967/7rQOCEjZlvGsxtnsiAbHOo1sYUm25teYc= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Cc: Subject: [AUH] ovmf: upgrading to edk2-stable202602 SUCCEEDED Message-ID: <0101019e2bcba9f3-eb1c7f6e-cd83-4a2e-85ee-7cd657b6ac5d-000000@us-west-2.amazonses.com> Date: Fri, 15 May 2026 13:20:28 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2026.05.15-54.240.27.23 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 May 2026 13:20:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/237106 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *ovmf* to *edk2-stable202602* has Succeeded. Next steps: - apply the patch: git am 0001-ovmf-upgrade-edk2-stable202511-edk2-stable202602.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 0ba57b9ae60c80b112fec73855b2bc0142faed68 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 May 2026 07:01:05 +0000 Subject: [PATCH] ovmf: upgrade edk2-stable202511 -> edk2-stable202602 --- ...Tools-StringFuncs-fix-gcc-16-warning.patch | 43 ----------------- ...ovmf-update-path-to-native-BaseTools.patch | 9 ++-- ...aseTools-EfiRom-fix-compiler-warning.patch | 45 ------------------ ...ile-adjust-to-build-in-under-bitbake.patch | 9 ++-- .../ovmf/ovmf/0003-debug-prefix-map.patch | 25 +++++----- .../ovmf/ovmf/0004-reproducible.patch | 29 ++++++------ ...ceptionHandlerLib-fix-push-instructi.patch | 46 ------------------- meta/recipes-core/ovmf/ovmf_git.bb | 7 +-- 8 files changed, 32 insertions(+), 181 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0002-BaseTools-EfiRom-fix-compiler-warning.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch diff --git a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch b/meta/recipes-core/ovmf/ovmf/0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch deleted file mode 100644 index 38c26224df..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3597306191297b504683b83fe7750e49c6a2e836 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 29 Jan 2026 09:23:32 +0100 -Subject: [PATCH 1/2] BaseTools/StringFuncs: fix gcc 16 warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -StringFuncs.c: In function ‘SplitStringByWhitespace’: -StringFuncs.c:113:15: error: variable ‘Item’ set but not used [-Werror=unused-but-set-variable=] - 113 | UINTN Item; - | ^~~~ - -Signed-off-by: Gerd Hoffmann -Upstream-Status: Backport ---- - BaseTools/Source/C/Common/StringFuncs.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/Common/StringFuncs.c b/BaseTools/Source/C/Common/StringFuncs.c -index 53e44365e9..df02d9c808 100644 ---- a/BaseTools/Source/C/Common/StringFuncs.c -+++ b/BaseTools/Source/C/Common/StringFuncs.c -@@ -110,7 +110,6 @@ SplitStringByWhitespace ( - CHAR8 *EndOfSubString; - CHAR8 *EndOfString; - STRING_LIST *Output; -- UINTN Item; - - String = CloneString (String); - if (String == NULL) { -@@ -120,7 +119,7 @@ SplitStringByWhitespace ( - - Output = NewStringList (); - -- for (Pos = String, Item = 0; Pos < EndOfString; Item++) { -+ for (Pos = String; Pos < EndOfString;) { - while (isspace ((int)*Pos)) { - Pos++; - } --- -2.53.0 - diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch index bc70c1ab91..83c468eb56 100644 --- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch @@ -1,7 +1,7 @@ -From 89a7bfe82c9dea89fa7d859eb392aa414a365578 Mon Sep 17 00:00:00 2001 +From 8328971a657d623eaa4894a85a0f91b5df1c3767 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Thu, 9 Jun 2016 02:23:01 -0700 -Subject: [PATCH 1/5] ovmf: update path to native BaseTools +Subject: [PATCH] ovmf: update path to native BaseTools BaseTools is a set of utilities to build EDK-based firmware. These utilities are used during the build process. Thus, they need to be built natively. @@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [oe-core cross compile specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh -index 30f4830173..ce4ffb20ab 100755 +index 164c11f641..18b68ffd1f 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -24,7 +24,7 @@ then @@ -28,6 +28,3 @@ index 30f4830173..ce4ffb20ab 100755 echo $EDK_TOOLS_PATH source edksetup.sh BaseTools else --- -2.47.3 - diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-EfiRom-fix-compiler-warning.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-EfiRom-fix-compiler-warning.patch deleted file mode 100644 index f463103661..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-EfiRom-fix-compiler-warning.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9af06ef3cbb052b142f9660c2c01e7aeb401300c Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 8 Dec 2025 10:28:50 +0100 -Subject: [PATCH 2/2] BaseTools/EfiRom: fix compiler warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -New warning after updating gcc: - -EfiRom.c: In function ‘main’: -EfiRom.c:78:17: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] - -The assigned value is not used, so fix the warning by just removing it. - -Signed-off-by: Gerd Hoffmann -Upstream-Status: Backport ---- - BaseTools/Source/C/EfiRom/EfiRom.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/EfiRom/EfiRom.c b/BaseTools/Source/C/EfiRom/EfiRom.c -index fa7bf0e62e..6e903b3504 100644 ---- a/BaseTools/Source/C/EfiRom/EfiRom.c -+++ b/BaseTools/Source/C/EfiRom/EfiRom.c -@@ -44,7 +44,6 @@ Returns: - FILE_LIST *FList; - UINT32 TotalSize; - UINT32 Size; -- CHAR8 *Ptr0; - - SetUtilityName(UTILITY_NAME); - -@@ -75,7 +74,7 @@ Returns: - // - if (mOptions.DumpOption == 1) { - if (mOptions.FileList != NULL) { -- if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) { -+ if (strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION) != NULL) { - DumpImage (mOptions.FileList); - goto BailOut; - } else { --- -2.53.0 - diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index 27c4324b67..1505172978 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch @@ -1,7 +1,7 @@ -From 8b4941871ccc88ed8b31eb7ffc097e1fe39fe57d Mon Sep 17 00:00:00 2001 +From 944572fdbd69c66f293903d4526f8e08198726cf Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Fri, 26 Jul 2019 17:34:26 -0400 -Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake +Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories. @@ -18,7 +18,7 @@ Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 53e73abe53..0b3f9bbb2a 100644 +index d63f487724..0403f83f77 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -151,35 +151,34 @@ endif @@ -64,6 +64,3 @@ index 53e73abe53..0b3f9bbb2a 100644 ifeq ($(HOST_ARCH), IA32) # # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults --- -2.47.3 - diff --git a/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch index 18ea24802a..6928ac1a09 100644 --- a/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch +++ b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch @@ -1,7 +1,7 @@ -From 640b1e443a1b400d32d9af0c478abbbaebd491f1 Mon Sep 17 00:00:00 2001 +From 56043c8cb8ce0fc5976b151e6bd4c85893f64032 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Jun 2021 19:56:28 +0200 -Subject: [PATCH 3/5] debug prefix map +Subject: [PATCH] debug prefix map We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in --debug-prefix-map to nasm (we carry a patch to nasm for this). The @@ -22,10 +22,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 90a389bdff..1e134b299a 100755 +index 1d65eeb4c7..de4150c693 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -833,7 +833,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_ +@@ -951,7 +951,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_ *_*_*_DTC_PATH = DEF(DTC_BIN) # All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64 @@ -34,7 +34,7 @@ index 90a389bdff..1e134b299a 100755 DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global 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 DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global -@@ -845,8 +845,8 @@ DEFINE GCC_AARCH64_DLINK_FLAGS = -Wl,--emit-relocs -nostdlib -Wl,--gc-sectio +@@ -963,8 +963,8 @@ DEFINE GCC_AARCH64_DLINK_FLAGS = -Wl,--emit-relocs -nostdlib -Wl,--gc-sectio DEFINE GCC_LOONGARCH64_DLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_COMMON) -z common-page-size=0x20 DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -z common-page-size=0x20 DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) @@ -45,7 +45,7 @@ index 90a389bdff..1e134b299a 100755 DEFINE GCC_VFRPP_FLAGS = -x c -E -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h DEFINE GCC_ASLCC_FLAGS = -x c -include AutoGen.h -fshort-wchar -@@ -980,7 +980,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( +@@ -1099,7 +1099,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC48_IA32_OBJCOPY_FLAGS = @@ -54,7 +54,7 @@ index 90a389bdff..1e134b299a 100755 DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable -@@ -1008,7 +1008,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set +@@ -1127,7 +1127,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC48_X64_OBJCOPY_FLAGS = @@ -63,7 +63,7 @@ index 90a389bdff..1e134b299a 100755 DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable -@@ -1087,7 +1087,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s +@@ -1207,7 +1207,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC49_IA32_OBJCOPY_FLAGS = @@ -72,7 +72,7 @@ index 90a389bdff..1e134b299a 100755 DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -1115,7 +1115,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set +@@ -1235,7 +1235,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC49_X64_OBJCOPY_FLAGS = @@ -81,7 +81,7 @@ index 90a389bdff..1e134b299a 100755 DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable -@@ -1314,7 +1314,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 +@@ -1436,7 +1436,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_GCC5_IA32_OBJCOPY_FLAGS = @@ -90,7 +90,7 @@ index 90a389bdff..1e134b299a 100755 DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 -@@ -1346,7 +1346,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -1468,7 +1468,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC5_X64_OBJCOPY_FLAGS = @@ -99,6 +99,3 @@ index 90a389bdff..1e134b299a 100755 DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os --- -2.47.3 - diff --git a/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch index b42ecde211..b38f02f155 100644 --- a/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch +++ b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch @@ -1,7 +1,7 @@ -From 8b218dffa0368fbc2bfb5d8051b358476266fcb4 Mon Sep 17 00:00:00 2001 +From 78d5ea52eeec7a860532194ea92b6eae5a1af874 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Jun 2021 19:57:30 +0200 -Subject: [PATCH 4/5] reproducible +Subject: [PATCH] reproducible This patch fixes various things which make the build more reproducible. Some changes here only change intermediate artefacts but that means when you have two build trees @@ -35,7 +35,7 @@ Signed-off-by: Alexander Kanavin 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c -index 83f1b285c2..e2f582f8fb 100644 +index bf4baf05d7..295f3f6efb 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -47,7 +47,7 @@ index 83f1b285c2..e2f582f8fb 100644 #endif #include #include -@@ -995,7 +997,7 @@ ScanSections64 ( +@@ -996,7 +998,7 @@ ScanSections64 ( } mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + @@ -56,7 +56,7 @@ index 83f1b285c2..e2f582f8fb 100644 // // Add more space in the .debug data region for the DllCharacteristicsEx -@@ -2329,7 +2331,7 @@ WriteDebug64 ( +@@ -2330,7 +2332,7 @@ WriteDebug64 ( EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry; @@ -65,7 +65,7 @@ index 83f1b285c2..e2f582f8fb 100644 NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]; -@@ -2362,7 +2364,7 @@ WriteDebug64 ( +@@ -2363,7 +2365,7 @@ WriteDebug64 ( Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); Nb10->Signature = CODEVIEW_SIGNATURE_NB10; @@ -89,10 +89,10 @@ index b829a2503c..afe826b78f 100644 if Input not in self.Inputs: self.Inputs.append(Input) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py -index e5f282c4ac..27a34ef7c6 100755 +index b729103efd..afc5b14a8a 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py -@@ -571,7 +571,7 @@ cleanlib: +@@ -579,7 +579,7 @@ cleanlib: os.remove(RespFileList) # convert source files and binary files to build targets @@ -101,7 +101,7 @@ index e5f282c4ac..27a34ef7c6 100755 if len(self.ResultFileList) == 0 and len(MyAgo.SourceFileList) != 0: EdkLogger.error("build", AUTOGEN_ERROR, "Nothing to build", ExtraData="[%s]" % str(MyAgo)) -@@ -722,7 +722,7 @@ cleanlib: +@@ -730,7 +730,7 @@ cleanlib: OutputFile = '' DepsFileList = [] @@ -110,7 +110,7 @@ index e5f282c4ac..27a34ef7c6 100755 if Cmd[2]: for CopyCmd in Cmd[2]: Src, Dst = CopyCmd -@@ -755,7 +755,7 @@ cleanlib: +@@ -763,7 +763,7 @@ cleanlib: self.BuildTargetList.append('\t%s' % CmdString) self.ParseSecCmd(DepsFileList, Cmd[1]) @@ -119,7 +119,7 @@ index e5f282c4ac..27a34ef7c6 100755 self.BuildTargetList.append('%s : %s' % (self.ReplaceMacro(SecOutputFile), self.ReplaceMacro(SecDepsFile))) self.BuildTargetList.append('\t%s' % self.ReplaceMacro(SecCmd)) self.FfsOutputFileList = [] -@@ -794,13 +794,13 @@ cleanlib: +@@ -802,13 +802,13 @@ cleanlib: def CommandExceedLimit(self): FlagDict = { @@ -140,7 +140,7 @@ index e5f282c4ac..27a34ef7c6 100755 } RespDict = {} -@@ -1014,9 +1014,9 @@ cleanlib: +@@ -1022,9 +1022,9 @@ cleanlib: if not self.ObjTargetDict.get(T.Target.SubDir): self.ObjTargetDict[T.Target.SubDir] = set() self.ObjTargetDict[T.Target.SubDir].add(NewFile) @@ -153,7 +153,7 @@ index e5f282c4ac..27a34ef7c6 100755 if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: self.FileListMacros[T.FileListMacro] = [] diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py -index 764c51789b..40aadbcfbc 100755 +index c358d7f0e3..6ed48091fa 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -1429,6 +1429,9 @@ class ModuleAutoGen(AutoGen): @@ -175,6 +175,3 @@ index 764c51789b..40aadbcfbc 100755 # Ignore generating makefile when it is a binary module if self.IsBinaryModule: --- -2.47.3 - diff --git a/meta/recipes-core/ovmf/ovmf/0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch b/meta/recipes-core/ovmf/ovmf/0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch deleted file mode 100644 index 650e084b5b..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7e6be0f4068a2158af3c97e873edb33fa4d5c6b8 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 3 Nov 2025 09:56:52 +0100 -Subject: [PATCH 5/5] UefiCpuPkg/CpuExceptionHandlerLib: fix push instructions - -Nasm 3.0 complains about 'dword' being invalid. The comment talks about -a '8-byte value' so 'qword' should be correct here. - -With this change the extra comment explaining that the instruction -actually pushes an 8-byte value despite the 'dword' keyword is not -needed any more. Drop it. - -Fixes: https://github.com/tianocore/edk2/issues/11635 -Signed-off-by: Gerd Hoffmann -Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/9ccf8751a74f26142e584c7b7c7572a182b67997] -(cherry picked from commit 9ccf8751a74f26142e584c7b7c7572a182b67997) -Signed-off-by: Ankur Tyagi ---- - .../CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm -index 3d64ac9080..671ed98f85 100644 ---- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm -+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm -@@ -57,7 +57,7 @@ ALIGN 8 - AsmIdtVectorBegin: - %assign Vector 0 - %rep 256 -- push strict dword %[Vector] ; This instruction pushes sign-extended 8-byte value on stack -+ push strict qword %[Vector] - push rax - %ifdef NO_ABSOLUTE_RELOCS_IN_TEXT - mov rax, strict qword 0 ; mov rax, ASM_PFX(CommonInterruptEntry) -@@ -70,7 +70,7 @@ AsmIdtVectorBegin: - AsmIdtVectorEnd: - - HookAfterStubHeaderBegin: -- push strict dword 0 ; 0 will be fixed -+ push strict qword 0 ; 0 will be fixed - VectorNum: - push rax - %ifdef NO_ABSOLUTE_RELOCS_IN_TEXT --- -2.47.3 - diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 958f42fc10..24fc26e43c 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -25,13 +25,10 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https;ta file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-debug-prefix-map.patch \ file://0004-reproducible.patch \ - file://0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch \ - file://0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch \ - file://0002-BaseTools-EfiRom-fix-compiler-warning.patch \ " -PV = "edk2-stable202511" -SRCREV = "46548b1adac82211d8d11da12dd914f41e7aa775" +PV = "edk2-stable202602" +SRCREV = "b7a715f7c03c45c6b4575bf88596bfd79658b8ce" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" CVE_PRODUCT = "edk2"