public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Robert Scheck <robert@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/efifs] epel9: Upgrade to 1.12 (#2434006, #2452299)
Date: Sun, 19 Jul 2026 03:39:53 GMT [thread overview]
Message-ID: <178443239376.1.13375739837047301919.rpms-efifs-4a7d47cf4511@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/efifs
Branch : epel9
Commit : 4a7d47cf451163709715bcf1207c3150491cd78f
Author : Robert Scheck <robert@fedoraproject.org>
Date : 2026-07-19T05:32:05+02:00
Stats : +562/-9 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/efifs/c/4a7d47cf451163709715bcf1207c3150491cd78f?branch=epel9
Log:
Upgrade to 1.12 (#2434006, #2452299)
---
diff --git a/edk2-20260213-parallel-make.patch b/edk2-20260213-parallel-make.patch
new file mode 100644
index 0000000..066e410
--- /dev/null
+++ b/edk2-20260213-parallel-make.patch
@@ -0,0 +1,43 @@
+From ba0914bfdabb8e7d5c09dfbc42cc2b580729b2b3 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.
+
+Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
+---
+ 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 b469bd3f303f..4f10b1d9338b 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:
diff --git a/efifs-1.12-edk2-20260213.patch b/efifs-1.12-edk2-20260213.patch
new file mode 100644
index 0000000..ca90e0c
--- /dev/null
+++ b/efifs-1.12-edk2-20260213.patch
@@ -0,0 +1,502 @@
+From c5621f5b21aa0197f9434a153f5bc46030fe43c1 Mon Sep 17 00:00:00 2001
+From: danjujan <44864658+danjujan@users.noreply.github.com>
+Date: Tue, 21 Apr 2026 20:03:35 +0200
+Subject: [PATCH] Remove gEfiUnicodeCollationProtocolGuid protocol
+
+---
+ EfiFsPkg/Affs.inf | 1 -
+ EfiFsPkg/Afs.inf | 1 -
+ EfiFsPkg/Bfs.inf | 1 -
+ EfiFsPkg/Btrfs.inf | 1 -
+ EfiFsPkg/Cbfs.inf | 1 -
+ EfiFsPkg/Cpio.inf | 1 -
+ EfiFsPkg/CpioBe.inf | 1 -
+ EfiFsPkg/EroFs.inf | 1 -
+ EfiFsPkg/ExFat.inf | 1 -
+ EfiFsPkg/Ext2.inf | 1 -
+ EfiFsPkg/F2fs.inf | 1 -
+ EfiFsPkg/Fat.inf | 1 -
+ EfiFsPkg/Hfs.inf | 1 -
+ EfiFsPkg/HfsPlus.inf | 1 -
+ EfiFsPkg/Iso9660.inf | 1 -
+ EfiFsPkg/Jfs.inf | 1 -
+ EfiFsPkg/Minix.inf | 1 -
+ EfiFsPkg/Minix2.inf | 1 -
+ EfiFsPkg/Minix2Be.inf | 1 -
+ EfiFsPkg/Minix3.inf | 1 -
+ EfiFsPkg/Minix3Be.inf | 1 -
+ EfiFsPkg/MinixBe.inf | 1 -
+ EfiFsPkg/NewC.inf | 1 -
+ EfiFsPkg/NilFs2.inf | 1 -
+ EfiFsPkg/Ntfs.inf | 1 -
+ EfiFsPkg/Odc.inf | 1 -
+ EfiFsPkg/ProcFs.inf | 1 -
+ EfiFsPkg/ReiserFs.inf | 1 -
+ EfiFsPkg/RomFs.inf | 1 -
+ EfiFsPkg/Sfs.inf | 1 -
+ EfiFsPkg/SquashFs.inf | 1 -
+ EfiFsPkg/Tar.inf | 1 -
+ EfiFsPkg/Udf.inf | 1 -
+ EfiFsPkg/Ufs.inf | 1 -
+ EfiFsPkg/Ufs2.inf | 1 -
+ EfiFsPkg/UfsBe.inf | 1 -
+ EfiFsPkg/Xfs.inf | 1 -
+ EfiFsPkg/Zfs.inf | 1 -
+ 38 files changed, 38 deletions(-)
+
+diff --git a/EfiFsPkg/Affs.inf b/EfiFsPkg/Affs.inf
+index 32f1c7d..2725133 100644
+--- a/EfiFsPkg/Affs.inf
++++ b/EfiFsPkg/Affs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Afs.inf b/EfiFsPkg/Afs.inf
+index af99c10..cada33f 100644
+--- a/EfiFsPkg/Afs.inf
++++ b/EfiFsPkg/Afs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Bfs.inf b/EfiFsPkg/Bfs.inf
+index 5c8c46f..ab6505f 100644
+--- a/EfiFsPkg/Bfs.inf
++++ b/EfiFsPkg/Bfs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Btrfs.inf b/EfiFsPkg/Btrfs.inf
+index e8ebb1a..1a29825 100644
+--- a/EfiFsPkg/Btrfs.inf
++++ b/EfiFsPkg/Btrfs.inf
+@@ -68,7 +68,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Cbfs.inf b/EfiFsPkg/Cbfs.inf
+index 304bfcd..bf8a34f 100644
+--- a/EfiFsPkg/Cbfs.inf
++++ b/EfiFsPkg/Cbfs.inf
+@@ -58,7 +58,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Cpio.inf b/EfiFsPkg/Cpio.inf
+index 969952d..285631f 100644
+--- a/EfiFsPkg/Cpio.inf
++++ b/EfiFsPkg/Cpio.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/CpioBe.inf b/EfiFsPkg/CpioBe.inf
+index aeb6c7a..dc2558b 100644
+--- a/EfiFsPkg/CpioBe.inf
++++ b/EfiFsPkg/CpioBe.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/EroFs.inf b/EfiFsPkg/EroFs.inf
+index 10b3589..e30fe91 100644
+--- a/EfiFsPkg/EroFs.inf
++++ b/EfiFsPkg/EroFs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/ExFat.inf b/EfiFsPkg/ExFat.inf
+index c0b0afa..88ffc19 100644
+--- a/EfiFsPkg/ExFat.inf
++++ b/EfiFsPkg/ExFat.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Ext2.inf b/EfiFsPkg/Ext2.inf
+index 758f30c..1b14e96 100644
+--- a/EfiFsPkg/Ext2.inf
++++ b/EfiFsPkg/Ext2.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/F2fs.inf b/EfiFsPkg/F2fs.inf
+index da602b3..f60f174 100644
+--- a/EfiFsPkg/F2fs.inf
++++ b/EfiFsPkg/F2fs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Fat.inf b/EfiFsPkg/Fat.inf
+index af06ead..afbfe11 100644
+--- a/EfiFsPkg/Fat.inf
++++ b/EfiFsPkg/Fat.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Hfs.inf b/EfiFsPkg/Hfs.inf
+index 4293047..c252b90 100644
+--- a/EfiFsPkg/Hfs.inf
++++ b/EfiFsPkg/Hfs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/HfsPlus.inf b/EfiFsPkg/HfsPlus.inf
+index c53e0db..2161ee2 100644
+--- a/EfiFsPkg/HfsPlus.inf
++++ b/EfiFsPkg/HfsPlus.inf
+@@ -58,7 +58,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Iso9660.inf b/EfiFsPkg/Iso9660.inf
+index f42fa56..76b9d4e 100644
+--- a/EfiFsPkg/Iso9660.inf
++++ b/EfiFsPkg/Iso9660.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Jfs.inf b/EfiFsPkg/Jfs.inf
+index 3e25364..d10f385 100644
+--- a/EfiFsPkg/Jfs.inf
++++ b/EfiFsPkg/Jfs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Minix.inf b/EfiFsPkg/Minix.inf
+index 5883b63..b0419fd 100644
+--- a/EfiFsPkg/Minix.inf
++++ b/EfiFsPkg/Minix.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Minix2.inf b/EfiFsPkg/Minix2.inf
+index 74d29e4..cd1dfe5 100644
+--- a/EfiFsPkg/Minix2.inf
++++ b/EfiFsPkg/Minix2.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Minix2Be.inf b/EfiFsPkg/Minix2Be.inf
+index eae0078..8599218 100644
+--- a/EfiFsPkg/Minix2Be.inf
++++ b/EfiFsPkg/Minix2Be.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Minix3.inf b/EfiFsPkg/Minix3.inf
+index 01914c2..360cecc 100644
+--- a/EfiFsPkg/Minix3.inf
++++ b/EfiFsPkg/Minix3.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Minix3Be.inf b/EfiFsPkg/Minix3Be.inf
+index ea7b8ff..785bd0b 100644
+--- a/EfiFsPkg/Minix3Be.inf
++++ b/EfiFsPkg/Minix3Be.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/MinixBe.inf b/EfiFsPkg/MinixBe.inf
+index 94ba002..e63db1f 100644
+--- a/EfiFsPkg/MinixBe.inf
++++ b/EfiFsPkg/MinixBe.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/NewC.inf b/EfiFsPkg/NewC.inf
+index 0799005..6239360 100644
+--- a/EfiFsPkg/NewC.inf
++++ b/EfiFsPkg/NewC.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/NilFs2.inf b/EfiFsPkg/NilFs2.inf
+index 12bd365..8217838 100644
+--- a/EfiFsPkg/NilFs2.inf
++++ b/EfiFsPkg/NilFs2.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Ntfs.inf b/EfiFsPkg/Ntfs.inf
+index ecae0aa..1fda300 100644
+--- a/EfiFsPkg/Ntfs.inf
++++ b/EfiFsPkg/Ntfs.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Odc.inf b/EfiFsPkg/Odc.inf
+index f0c4ac7..17324b9 100644
+--- a/EfiFsPkg/Odc.inf
++++ b/EfiFsPkg/Odc.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/ProcFs.inf b/EfiFsPkg/ProcFs.inf
+index 5f0e546..a54bd7f 100644
+--- a/EfiFsPkg/ProcFs.inf
++++ b/EfiFsPkg/ProcFs.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/ReiserFs.inf b/EfiFsPkg/ReiserFs.inf
+index a5f0b2d..bfb43df 100644
+--- a/EfiFsPkg/ReiserFs.inf
++++ b/EfiFsPkg/ReiserFs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/RomFs.inf b/EfiFsPkg/RomFs.inf
+index 5d66241..aac91ec 100644
+--- a/EfiFsPkg/RomFs.inf
++++ b/EfiFsPkg/RomFs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Sfs.inf b/EfiFsPkg/Sfs.inf
+index 0841a5d..64f0dcc 100644
+--- a/EfiFsPkg/Sfs.inf
++++ b/EfiFsPkg/Sfs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/SquashFs.inf b/EfiFsPkg/SquashFs.inf
+index 1df914c..efa3bef 100644
+--- a/EfiFsPkg/SquashFs.inf
++++ b/EfiFsPkg/SquashFs.inf
+@@ -66,7 +66,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Tar.inf b/EfiFsPkg/Tar.inf
+index 7a40f05..41c9d81 100644
+--- a/EfiFsPkg/Tar.inf
++++ b/EfiFsPkg/Tar.inf
+@@ -57,7 +57,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Udf.inf b/EfiFsPkg/Udf.inf
+index 8ad462e..695b3e7 100644
+--- a/EfiFsPkg/Udf.inf
++++ b/EfiFsPkg/Udf.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Ufs.inf b/EfiFsPkg/Ufs.inf
+index 3e92a38..2affea8 100644
+--- a/EfiFsPkg/Ufs.inf
++++ b/EfiFsPkg/Ufs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Ufs2.inf b/EfiFsPkg/Ufs2.inf
+index 1c68aea..51ed8ef 100644
+--- a/EfiFsPkg/Ufs2.inf
++++ b/EfiFsPkg/Ufs2.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/UfsBe.inf b/EfiFsPkg/UfsBe.inf
+index 53836a7..3b0931b 100644
+--- a/EfiFsPkg/UfsBe.inf
++++ b/EfiFsPkg/UfsBe.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Xfs.inf b/EfiFsPkg/Xfs.inf
+index 399659c..ab0f665 100644
+--- a/EfiFsPkg/Xfs.inf
++++ b/EfiFsPkg/Xfs.inf
+@@ -56,7 +56,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
+diff --git a/EfiFsPkg/Zfs.inf b/EfiFsPkg/Zfs.inf
+index ea48c5c..e0d635b 100644
+--- a/EfiFsPkg/Zfs.inf
++++ b/EfiFsPkg/Zfs.inf
+@@ -70,7 +70,6 @@
+ gEfiBlockIoProtocolGuid
+ gEfiBlockIo2ProtocolGuid
+ gEfiSimpleFileSystemProtocolGuid
+- gEfiUnicodeCollationProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
+ gEfiDevicePathToTextProtocolGuid
+
diff --git a/efifs.spec b/efifs.spec
index 35b90dd..43b3108 100644
--- a/efifs.spec
+++ b/efifs.spec
@@ -5,28 +5,30 @@
%global efi_vendor %{name}
# Git commit mentioned at https://github.com/pbatard/efifs
-%global grub2_version 2.13-0
-%global grub2_commit 6811f6f09d61996a3acbc4fc0414e45964f0e2d9
+%global grub2_version 2.14-0
+%global grub2_commit d38d6a1a9b79427848976f53d474392cd29c2a71
# Preferrably the latest stable version shipped in Fedora
-%global edk2_stable_date 20250221
+%global edk2_stable_date 20260213
%global edk2_stable_str edk2-stable%(d=%{edk2_stable_date}; echo ${d:0:6})
Summary: Free software EFI/UEFI standalone file system drivers
Name: efifs
-Version: 1.11
-Release: 6%{?dist}
+Version: 1.12
+Release: 1%{?dist}
License: GPL-3.0-or-later
URL: https://efi.akeo.ie/
Source0: https://github.com/pbatard/efifs/archive/v%{version}/%{name}-%{version}.tar.gz
# Fedora's grub2 RPM packages don't provide neither a -devel subpackage nor any
# patched GRUB2 sources such as grub-core/{kern/{err,list,misc},fs/{fshelp,<fs>}.c
-Source1: https://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-%{grub2_commit}.tar.gz
+Source1: https://gitlab.freedesktop.org/gnu-grub/grub/-/archive/%{grub2_commit}/grub-%{grub2_commit}.tar.gz
# Fedora's edk2 RPM packages might be nice, but unusable for EfiFs depending on
# EDK II build artifacts and files such as MdePkg/MdePkg.dec, ShellPkg/ShellPkg.dec
Source2: https://github.com/tianocore/edk2/archive/%{edk2_stable_str}.tar.gz
# Small helper script to enable EfiFs drivers using efibootmgr
Source3: efifs-enable.sh
+Patch0: https://github.com/pbatard/EfiFs/pull/53.patch#/efifs-1.12-edk2-20260213.patch
+Patch1: https://github.com/tianocore/edk2/pull/12199.patch#/edk2-20260213-parallel-make.patch
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?rhel} == 8
@@ -59,6 +61,8 @@ mv -f EfiFs-%{version} %{name}-%{version}
cp -p %{SOURCE3} .
pushd %{name}-%{version}
+%patch -P0 -p1 -b .efifs-1.12-edk2-20260213
+
# Extract GRUB2 into place (Git submodule)
tar -xf %{SOURCE1} --strip-components=1 --directory grub
@@ -67,6 +71,7 @@ cd grub && patch -Np1 -i ../0001-GRUB-fixes.patch
popd
pushd edk2-%{edk2_stable_str}
+%patch -P1 -p1 -b .edk2-20260213-parallel-make
# Do not build BrotliCompress (because it's unused)
sed -e '/BrotliCompress/d' -i BaseTools/Source/C/GNUmakefile
@@ -111,6 +116,9 @@ install -p -m 0700 edk2-%{edk2_stable_str}/Build/EfiFs/RELEASE_GCC5/%{efi_arch_u
%{efi_esp_dir}/
%changelog
+* Sun Jul 19 2026 Robert Scheck <robert@fedoraproject.org> 1.12-1
+- Upgrade to 1.12 (#2434006, #2452299)
+
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 70ae576..16daf34 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (efifs-1.11.tar.gz) = 2cd91abba8e33fe4e73a2da795b00126232c8fbd5da049255cbc3acc9c94d4c5b7067b1a24eb4403d5c384ca93770eb9a038b854f010238b85a63525c4cc0b3e
-SHA512 (edk2-stable202502.tar.gz) = 1421b3e14acf6aa51c84cf0a12716990f08815fff631f4657bb9907fd8d620e9fac7794e05c2eed54d5f8966f8e9267d32bf2256237a959bd727629163b8c00d
-SHA512 (grub-6811f6f09d61996a3acbc4fc0414e45964f0e2d9.tar.gz) = 73adfc7fd9c13ae40e14049904915e187a7b3ebfbe6a2b5b106df7a650771a384adcd3f907a29370b5194eefeff4011aa90a4d57100ca559c9d87b0c7540e140
+SHA512 (efifs-1.12.tar.gz) = ee0010fbfe2657fc8a1300aa3475d7bbe9d143eeac0fa79ae156d461f4605b3ee90a73028483bb8c0eaa61527ee50cfde13858740d4e63d8bdeac75f131c775b
+SHA512 (edk2-stable202602.tar.gz) = ca59bd003d189c6cf68f8e06d9395fda8744c1155eb50feec05ab2df9dbf683ca09fbcf4ec4abed73413e546115399b45d1cbcc38029a3b8f88c75a436f84d87
+SHA512 (grub-d38d6a1a9b79427848976f53d474392cd29c2a71.tar.gz) = 400c5236f4cbd1b31b86f7a7f8a1d7e5ec0ec7f4a65a96b439da31796898cfe3c86c1da78cbfdc81b7b2bfa388ec30e69f7bf1ea9fb777dfb49a6b3bf2ce676f
reply other threads:[~2026-07-19 3:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178443239376.1.13375739837047301919.rpms-efifs-4a7d47cf4511@fedoraproject.org \
--to=robert@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox