{"id":2221213,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2221213/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/20260408195139.715468-1-ju.o@free.fr/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.1/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260408195139.715468-1-ju.o@free.fr>","date":"2026-04-08T19:51:39","name":"[v2,1/1] boot/edk2: bump to version edk2-stable202602","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e691b04c6e10e2603b41a1f914efc4cbbea6804b","submitter":{"id":80537,"url":"http://patchwork.ozlabs.org/api/1.1/people/80537/?format=json","name":"Julien Olivain","email":"ju.o@free.fr"},"delegate":{"id":89618,"url":"http://patchwork.ozlabs.org/api/1.1/users/89618/?format=json","username":"juju","first_name":"Julien","last_name":"Olivain","email":"juju@cotds.org"},"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20260408195139.715468-1-ju.o@free.fr/mbox/","series":[{"id":499207,"url":"http://patchwork.ozlabs.org/api/1.1/series/499207/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=499207","date":"2026-04-08T19:51:39","name":"[v2,1/1] boot/edk2: bump to version edk2-stable202602","version":2,"mbox":"http://patchwork.ozlabs.org/series/499207/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2221213/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221213/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["incoming-buildroot@patchwork.ozlabs.org","buildroot@buildroot.org"],"Delivered-To":["patchwork-incoming-buildroot@legolas.ozlabs.org","buildroot@buildroot.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=buildroot.org header.i=@buildroot.org\n header.a=rsa-sha256 header.s=default header.b=GGbLF0zf;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org\n (client-ip=140.211.166.138; helo=smtp1.osuosl.org;\n envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org)"],"Received":["from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4frYcR65WSz1yD3\n\tfor ;\n Thu, 09 Apr 2026 05:52:06 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id CC4A2827E0;\n\tWed, 8 Apr 2026 19:52:02 +0000 (UTC)","from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id VDzQNOVdbl65; Wed, 8 Apr 2026 19:52:01 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id E2F24827CA;\n\tWed, 8 Apr 2026 19:52:00 +0000 (UTC)","from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by lists1.osuosl.org (Postfix) with ESMTP id B71281F6\n for ; Wed, 8 Apr 2026 19:51:58 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp4.osuosl.org (Postfix) with ESMTP id 9D1844103E\n for ; Wed, 8 Apr 2026 19:51:58 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id BBCrgwDFARiw for ;\n Wed, 8 Apr 2026 19:51:57 +0000 (UTC)","from smtp5-g21.free.fr (smtp5-g21.free.fr\n [IPv6:2a01:e0c:1:1599::14])\n by smtp4.osuosl.org (Postfix) with ESMTPS id CDAB540B25\n for ; Wed, 8 Apr 2026 19:51:56 +0000 (UTC)","from home.juju.sh (unknown\n [IPv6:2a01:e0a:1065:2100:52d9:65fe:2df3:c492])\n (Authenticated sender: ju.o@free.fr)\n by smtp5-g21.free.fr (Postfix) with ESMTPSA id 962F96012D;\n Wed, 8 Apr 2026 21:51:48 +0200 (CEST)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org;\n receiver= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp1.osuosl.org E2F24827CA","OpenDKIM Filter v2.11.0 smtp4.osuosl.org CDAB540B25"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=buildroot.org;\n\ts=default; t=1775677921;\n\tbh=cX+pxysqScuTqFnzpl4yaNuMmVwILXNyvyTF0gA+ecA=;\n\th=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive:\n\t List-Post:List-Help:List-Subscribe:From:Reply-To:From;\n\tb=GGbLF0zfpJsfklJXVkDufiM1weSD+P/pwfZVGscFzti/p2JZROPvH6zMAE02pPFxW\n\t bpjv5W3u8fFpEKuPqlOCgTF207BcTUVT8cu6zrtDaunWKcFt7u9Zxggj+Vv3xOtqMz\n\t GjrLIAaGIDgwWTiz47PGlHScG7i2yJc4yH0eajojHkBmtLSUQSoJTqXFtauDJUflYj\n\t d1Uw9Hz8Nx+KZO9G6FY86mdpA1WZvb7rwByOhEF6RJA8B3nzeahBqnIykaQ9s1Y64V\n\t kiSNkjtPSc2EqvJRf++3PgXiS8EBNuwX77XPCKg5O+PZjPeHzECPs6zqLqCTKcOpHx\n\t o+kHxcazmad4A==","Received-SPF":"Pass (mailfrom) identity=mailfrom;\n client-ip=2a01:e0c:1:1599::14;\n helo=smtp5-g21.free.fr; envelope-from=ju.o@free.fr; receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp4.osuosl.org CDAB540B25","To":"buildroot@buildroot.org","Cc":"Dick Olsson , Julien Olivain ,\n Romain Naour ,\n =?utf-8?q?Vincent_Stehl=C3=A9?= ","Date":"Wed, 8 Apr 2026 21:51:39 +0200","Message-ID":"<20260408195139.715468-1-ju.o@free.fr>","X-Mailer":"git-send-email 2.53.0","MIME-Version":"1.0","X-Mailman-Original-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=free.fr; s=smtp-20201208; t=1775677913;\n bh=0vaFy9utttP979wmCd4SNKHHOfIlR1uUH/rwMfKjML8=;\n h=From:To:Cc:Subject:Date:From;\n b=Xl62G+BZNZ3MlMVssGhTkLk6x2J+ixoI6fPlvjnO9/gn8h5sAQ59FvqEyUCNUQ8SN\n 2JYSxCEUoUYrQNGAXsZYsRVLc5SeXjIpEBLXx7GVcRay7nXOvEKEF96bufbTkEwsJN\n Ms+rnBN4OwTyTyO90sD0AgNx0TORXfBPML0tah+HC4jVMnZ5viC6N+9Hxf6zKmUYgE\n qYfhuev5MVmrndG4t2uji9nyoxdmoAD7qTRqf7Cw4mN8O6ppMRpJwfLR1ZULR0mrtB\n 9GaAbcl+dz4pyV4gLoKDRMX/SYgUOmvexuQ/JcJNq0hvaEOSjmRsOuzW44sdJC3Sy5\n kCckNFGmhcycQ==","X-Mailman-Original-Authentication-Results":["smtp4.osuosl.org;\n dmarc=pass (p=quarantine dis=none)\n header.from=free.fr","smtp4.osuosl.org;\n dkim=pass (2048-bit key,\n unprotected) header.d=free.fr header.i=@free.fr header.a=rsa-sha256\n header.s=smtp-20201208 header.b=Xl62G+BZ"],"Subject":"[Buildroot] [PATCH v2 1/1] boot/edk2: bump to version\n edk2-stable202602","X-BeenThere":"buildroot@buildroot.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","From":"Julien Olivain via buildroot ","Reply-To":"Julien Olivain ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"buildroot-bounces@buildroot.org","Sender":"\"buildroot\" "},"content":"For release notes since edk2-stable202511, see:\nhttps://github.com/tianocore/edk2/releases/tag/edk2-stable202602\n\nThis commit also updates the edk2-platforms packages with the last\ncommit merged at the edk2 release date (2026-02-13), which corresponds\nto commit [1].\nThe edk2-non-osi package is not updated because it did not received\nany commit since the last edk2 bump.\n\nThe commit removes the package patch 0001 which is included in\nthis new version. It also adds a new patch to fix parallel build\nfailures with a large number (>16) of processors. See:\nhttps://github.com/tianocore/edk2/pull/12199\n\nThis commit has been runtime tested with tests using EDK2 package,\nwith commands:\n\n support/testing/run-tests \\\n -d dl -o output_folder \\\n tests.boot.test_edk2 \\\n tests.boot.test_grub.TestGrubAArch64EFI \\\n tests.boot.test_grub.TestGrubRiscV64EFI \\\n tests.boot.test_grub.TestGrubX8664EFI \\\n tests.package.test_fwts\n\nIt has also been runtime tested (by booting in qemu) with defconfigs\nusing EDK2 package:\nqemu_aarch64_sbsa_defconfig\nqemu_loongarch64_virt_efi_defconfig\nqemu_riscv64_virt_efi_defconfig\nqemu_x86_64_efi_defconfig\n\n[1] https://github.com/tianocore/edk2-platforms/commit/23625e812490e6cf66ab9e74972c6a5129bf3e2a\n\nCc: Dick Olsson \nCc: Romain Naour \nCc: Vincent Stehlé \nTested-by: Julien Olivain \nSigned-off-by: Julien Olivain \n---\nNote: the Buildroot mailing list might remove the DOS newlines of\nthe EDK2 patch. For convenience, I also published this patch on:\nhttps://gitlab.com/jolivain/buildroot/-/tree/bump_edk2-stable202602\n---\nChanges v1 -> v2:\n- add upstream patch to fix parallel build failures\n---\n ...aseTools-EfiRom-fix-compiler-warning.patch | 46 ------------------\n ...-C-VfrCompile-Fix-parallel-make-fail.patch | 48 +++++++++++++++++++\n boot/edk2/edk2.hash | 2 +-\n boot/edk2/edk2.mk | 2 +-\n package/edk2-platforms/edk2-platforms.hash | 2 +-\n package/edk2-platforms/edk2-platforms.mk | 2 +-\n 6 files changed, 52 insertions(+), 50 deletions(-)\n delete mode 100644 boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch\n create mode 100644 boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch","diff":"diff --git a/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch b/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch\ndeleted file mode 100644\nindex c1e688cfe0..0000000000\n--- a/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-From 9af06ef3cbb052b142f9660c2c01e7aeb401300c Mon Sep 17 00:00:00 2001\n-From: Gerd Hoffmann \n-Date: Mon, 8 Dec 2025 10:28:50 +0100\n-Subject: [PATCH] BaseTools/EfiRom: fix compiler warning\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-New warning after updating gcc:\n-\n-EfiRom.c: In function ‘main’:\n-EfiRom.c:78:17: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]\n-\n-The assigned value is not used, so fix the warning by just removing it.\n-\n-Signed-off-by: Gerd Hoffmann \n-Upstream: https://github.com/tianocore/edk2/commit/9af06ef3cbb052b142f9660c2c01e7aeb401300c\n-Signed-off-by: Vincent Stehlé \n----\n- BaseTools/Source/C/EfiRom/EfiRom.c | 3 +--\n- 1 file changed, 1 insertion(+), 2 deletions(-)\n-\n-diff --git a/BaseTools/Source/C/EfiRom/EfiRom.c b/BaseTools/Source/C/EfiRom/EfiRom.c\n-index fa7bf0e62e..6e903b3504 100644\n---- a/BaseTools/Source/C/EfiRom/EfiRom.c\n-+++ b/BaseTools/Source/C/EfiRom/EfiRom.c\n-@@ -44,7 +44,6 @@ Returns:\n- FILE_LIST *FList;\r\n- UINT32 TotalSize;\r\n- UINT32 Size;\r\n-- CHAR8 *Ptr0;\r\n- \r\n- SetUtilityName(UTILITY_NAME);\r\n- \r\n-@@ -75,7 +74,7 @@ Returns:\n- //\r\n- if (mOptions.DumpOption == 1) {\r\n- if (mOptions.FileList != NULL) {\r\n-- if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) {\r\n-+ if (strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION) != NULL) {\r\n- DumpImage (mOptions.FileList);\r\n- goto BailOut;\r\n- } else {\r\n--- \n-2.53.0\n-\ndiff --git a/boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch b/boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch\nnew file mode 100644\nindex 0000000000..020d3d7467\n--- /dev/null\n+++ b/boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch\n@@ -0,0 +1,48 @@\n+From 3d3af4812d29c5527e5a701d2cb7aff671fdc182 Mon Sep 17 00:00:00 2001\n+From: Michael D Kinney \n+Date: Tue, 24 Feb 2026 21:50:20 -0800\n+Subject: [PATCH] BaseTools/Source/C/VfrCompile: Fix parallel make failures\n+\n+Update makefile rules to run antlr and dlg to completion\n+before compiling any of the generated cpp files.\n+\n+Without this change, parallel make may start compiling some\n+of the cpp files before both antlr and dlg have finished\n+which produces syntax errors from compilation with partially\n+generated files.\n+\n+Also use &: so the targets are treated as a group and the\n+rule is only executed once for the entire group. Without\n+this change, parallel make may run the rule actions more\n+than once and modify the output while it is being used by\n+another rule.\n+\n+Upstream: https://github.com/tianocore/edk2/commit/9fc0aca51e83afda703963ea177feeb78a125cbc\n+Signed-off-by: Michael D Kinney \n+Signed-off-by: Julien Olivain \n+---\n+ BaseTools/Source/C/VfrCompile/GNUmakefile | 7 ++++---\n+ 1 file changed, 4 insertions(+), 3 deletions(-)\n+\n+diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile\n+index b469bd3f30..4f10b1d933 100644\n+--- a/BaseTools/Source/C/VfrCompile/GNUmakefile\n++++ b/BaseTools/Source/C/VfrCompile/GNUmakefile\n+@@ -54,10 +54,11 @@ VfrCompiler.o: ../Include/Common/BuildVersion.h\n+ \r\n+ include $(MAKEROOT)/Makefiles/footer.makefile\r\n+ \r\n+-VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g\r\n+-\tPccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g\r\n++ANTLR_GEN = VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h\r\n++DLG_GEN = VfrLexer.cpp VfrLexer.h\r\n+ \r\n+-VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg\r\n++$(ANTLR_GEN) $(DLG_GEN) &: Pccts/antlr/antlr Pccts/dlg/dlg VfrSyntax.g\r\n++\tPccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g\r\n+ \tPccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg\r\n+ \r\n+ Pccts/antlr/antlr:\r\n+-- \n+2.53.0\n+\ndiff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash\nindex 8aa19bf545..ab9bbcf7ef 100644\n--- a/boot/edk2/edk2.hash\n+++ b/boot/edk2/edk2.hash\n@@ -1,3 +1,3 @@\n # Locally calculated\n-sha256 a8378e83060d621806b4237f6b2b9ead89d51f888d41e46e78d42b76d6594329 edk2-edk2-stable202511-git4.tar.gz\n+sha256 a44b47f2d233213cdb848206bda8d475b264ed1a2cf097ae9cd82581e4aa2090 edk2-edk2-stable202602-git4.tar.gz\n sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt\ndiff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk\nindex dba4aed513..11d9b90e7f 100644\n--- a/boot/edk2/edk2.mk\n+++ b/boot/edk2/edk2.mk\n@@ -4,7 +4,7 @@\n #\n ################################################################################\n \n-EDK2_VERSION = edk2-stable202511\n+EDK2_VERSION = edk2-stable202602\n EDK2_SITE = https://github.com/tianocore/edk2\n EDK2_SITE_METHOD = git\n EDK2_LICENSE = BSD-2-Clause-Patent\ndiff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash\nindex b3fa5d8424..31b84cf05a 100644\n--- a/package/edk2-platforms/edk2-platforms.hash\n+++ b/package/edk2-platforms/edk2-platforms.hash\n@@ -1,3 +1,3 @@\n # Locally calculated\n-sha256 96bb0d16d76285190663e15367d0c022a3a47230e5361d80b8549f546ad93fbe edk2-platforms-1e64c1109ae2ac0185351e8d0c19732970d4fecf.tar.gz\n+sha256 f06674ea8cebd2547acbff0245226bf97159d52df930b6161c4169ef0fa41215 edk2-platforms-23625e812490e6cf66ab9e74972c6a5129bf3e2a.tar.gz\n sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt\ndiff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk\nindex 7c46d9ed9f..cad3ccc5d2 100644\n--- a/package/edk2-platforms/edk2-platforms.mk\n+++ b/package/edk2-platforms/edk2-platforms.mk\n@@ -5,7 +5,7 @@\n ################################################################################\n \n # Keep in sync with latest commit as of the release date for boot/edk2\n-EDK2_PLATFORMS_VERSION = 1e64c1109ae2ac0185351e8d0c19732970d4fecf\n+EDK2_PLATFORMS_VERSION = 23625e812490e6cf66ab9e74972c6a5129bf3e2a\n EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION))\n EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent\n EDK2_PLATFORMS_LICENSE_FILES = License.txt\n","prefixes":["v2","1/1"]}