mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
c672b9499e
For release notes since edk2-stable202511, see:
https://github.com/tianocore/edk2/releases/tag/edk2-stable202602
This commit also updates the edk2-platforms packages with the last
commit merged at the edk2 release date (2026-02-13), which corresponds
to commit [1].
The edk2-non-osi package is not updated because it did not received
any commit since the last edk2 bump.
The commit removes the package patch 0001 which is included in
this new version. It also adds a new patch to fix parallel build
failures with a large number (>16) of processors. See:
https://github.com/tianocore/edk2/pull/12199
This commit has been runtime tested with tests using EDK2 package,
with commands:
support/testing/run-tests \
-d dl -o output_folder \
tests.boot.test_edk2 \
tests.boot.test_grub.TestGrubAArch64EFI \
tests.boot.test_grub.TestGrubRiscV64EFI \
tests.boot.test_grub.TestGrubX8664EFI \
tests.package.test_fwts
It has also been runtime tested (by booting in qemu) with defconfigs
using EDK2 package:
qemu_aarch64_sbsa_defconfig
qemu_loongarch64_virt_efi_defconfig
qemu_riscv64_virt_efi_defconfig
qemu_x86_64_efi_defconfig
[1] 23625e8124
Cc: Dick Olsson <hi@senzilla.io>
Cc: Romain Naour <romain.naour@smile.fr>
Cc: Vincent Stehlé <vincent.stehle@arm.com>
Tested-by: Julien Olivain <ju.o@free.fr>
Tested-by: Vincent Stehlé <vincent.stehle@arm.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From 3d3af4812d29c5527e5a701d2cb7aff671fdc182 Mon Sep 17 00:00:00 2001
|
|
From: Michael D Kinney <michael.d.kinney@intel.com>
|
|
Date: Tue, 24 Feb 2026 21:50:20 -0800
|
|
Subject: [PATCH] BaseTools/Source/C/VfrCompile: Fix parallel make failures
|
|
|
|
Update makefile rules to run antlr and dlg to completion
|
|
before compiling any of the generated cpp files.
|
|
|
|
Without this change, parallel make may start compiling some
|
|
of the cpp files before both antlr and dlg have finished
|
|
which produces syntax errors from compilation with partially
|
|
generated files.
|
|
|
|
Also use &: so the targets are treated as a group and the
|
|
rule is only executed once for the entire group. Without
|
|
this change, parallel make may run the rule actions more
|
|
than once and modify the output while it is being used by
|
|
another rule.
|
|
|
|
Upstream: https://github.com/tianocore/edk2/commit/9fc0aca51e83afda703963ea177feeb78a125cbc
|
|
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
|
|
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
|
---
|
|
BaseTools/Source/C/VfrCompile/GNUmakefile | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
|
|
index b469bd3f30..4f10b1d933 100644
|
|
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
|
|
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
|
|
@@ -54,10 +54,11 @@ VfrCompiler.o: ../Include/Common/BuildVersion.h
|
|
|
|
include $(MAKEROOT)/Makefiles/footer.makefile
|
|
|
|
-VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g
|
|
- Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g
|
|
+ANTLR_GEN = VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h
|
|
+DLG_GEN = VfrLexer.cpp VfrLexer.h
|
|
|
|
-VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg
|
|
+$(ANTLR_GEN) $(DLG_GEN) &: Pccts/antlr/antlr Pccts/dlg/dlg VfrSyntax.g
|
|
+ Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g
|
|
Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
|
|
|
|
Pccts/antlr/antlr:
|
|
--
|
|
2.53.0
|
|
|