Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

README.md

@@ -1,3 +1,3 @@
 # efifs
 
-Free software EFI/UEFI standalone file system drivers, based on the GRUB 2.0 read-only drivers: AFFS (Amiga Fast FileSystem), BFS (BeOS FileSystem), btrfs, exFAT, ext2/ext3/ext4, F2FS (experimental), HFS and HFS+ (Mac OS, including the compression support), ISO9660, JFS (Journaled FileSystem), nilfs2, NTFS (including compression support), ReiserFS, SFS (Amiga Smart FileSystem), UDF, UFS/FFS, UFS2/FFS2, XFS, ZFS and more.
+Free software EFI/UEFI standalone file system drivers, based on the GRUB 2.0 read-only drivers: AFFS (Amiga Fast FileSystem), BFS (BeOS FileSystem), btrfs, exFAT, ext2/ext3/ext4, EROFS, F2FS, HFS and HFS+ (Mac OS, including compression support), ISO9660, JFS (Journaled FileSystem), nilfs2, NTFS (including compression support), ReiserFS, SFS (Amiga Smart FileSystem), UDF, UFS/FFS, UFS2/FFS2, XFS, ZFS and more.

efifs.spec

@@ -5,18 +5,18 @@
 %global efi_vendor %{name}
 
 # Git commit mentioned at https://github.com/pbatard/efifs
-%global grub2_version    2.05-0
-%global grub2_commit     d7cac52eb21b866ffec66dc8d1319cc0695c94ee
+%global grub2_version    2.13-0
+%global grub2_commit     6811f6f09d61996a3acbc4fc0414e45964f0e2d9
 
 # Preferrably the latest stable version shipped in Fedora
-%global edk2_stable_date 202008
-%global edk2_stable_str  edk2-stable%{edk2_stable_date}
+%global edk2_stable_date 20250221
+%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.7
-Release:        2%{?dist}
-License:        GPLv3+
+Version:        1.11
+Release:        4%{?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
@@ -29,6 +29,10 @@ Source2:        https://github.com/tianocore/edk2/archive/%{edk2_stable_str}.tar
 Source3:        efifs-enable.sh
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
+%if 0%{?rhel} == 8
+# GCC >= 9.1 supports -mstack-protector-guard=global on aarch64
+BuildRequires:  gcc-toolset-12
+%endif
 BuildRequires:  make
 BuildRequires:  libuuid-devel
 BuildRequires:  python3
@@ -39,18 +43,19 @@ BuildRequires:  efi-srpm-macros
 ExclusiveArch:  %{efi}
 Requires:       efi-filesystem
 Provides:       bundled(grub2-efi-modules) = %{grub2_version}.git%(c=%{grub2_commit}; echo ${c:0:7})
-Provides:       bundled(edk2-tools) = %{edk2_stable_date}01stable
+Provides:       bundled(edk2-tools) = %{edk2_stable_date}
 
 %description
-Free software EFI/UEFI standalone file system drivers, based on the GRUB 2.0
-read-only drivers: AFFS (Amiga Fast FileSystem), BFS (BeOS FileSystem), btrfs,
-exFAT, ext2/ext3/ext4, F2FS (experimental), HFS and HFS+ (Mac OS, including
-the compression support), ISO9660, JFS (Journaled FileSystem), nilfs2, NTFS
-(including compression support), ReiserFS, SFS (Amiga Smart FileSystem), UDF,
-UFS/FFS, UFS2/FFS2, XFS, ZFS and more.
+Free software EFI/UEFI standalone file system drivers, based on the GRUB
+2.0 read-only drivers: AFFS (Amiga Fast FileSystem), BFS (BeOS FileSystem),
+btrfs, exFAT, ext2/ext3/ext4, EROFS, F2FS, HFS and HFS+ (Mac OS, including
+compression support), ISO9660, JFS (Journaled FileSystem), nilfs2, NTFS
+(including compression support), ReiserFS, SFS (Amiga Smart FileSystem),
+UDF, UFS/FFS, UFS2/FFS2, XFS, ZFS and more.
 
 %prep
 %setup -q -T -c %{name}-%{version} -a 0 -a 2
+mv -f EfiFs-%{version} %{name}-%{version}
 cp -p %{SOURCE3} .
 
 pushd %{name}-%{version}
@@ -62,14 +67,22 @@ cd grub && patch -Np1 -i ../0001-GRUB-fixes.patch
 popd
 
 pushd edk2-%{edk2_stable_str}
+
 # Do not build BrotliCompress (because it's unused)
 sed -e '/BrotliCompress/d' -i BaseTools/Source/C/GNUmakefile
 
+# Remove include path pointing to unused sub-module
+sed -e '/mipisyst/d' -i MdePkg/MdePkg.dec
+
 # Symlink EfiFs into EDK II build-time working directory
 ln -s ../%{name}-%{version} EfiFsPkg
 popd
 
 %build
+%if 0%{?rhel} == 8
+. /opt/rh/gcc-toolset-12/enable
+%endif
+
 pushd edk2-%{edk2_stable_str}
 export PYTHON_COMMAND=%{__python3}
 %make_build -C BaseTools EXTRA_OPTFLAGS="$RPM_OPT_FLAGS" EXTRA_LDFLAGS="$RPM_LD_FLAGS"
@@ -98,6 +111,54 @@ install -p -m 0700 edk2-%{edk2_stable_str}/Build/EfiFs/RELEASE_GCC5/%{efi_arch_u
 %{efi_esp_dir}/
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat May 17 2025 Robert Scheck <robert@fedoraproject.org> 1.11-3
+- Update bundled edk2 to 20250221 (#2340114)
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Dec 01 2024 Robert Scheck <robert@fedoraproject.org> 1.11-1
+- Upgrade to 1.11 (#2290813)
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sun Jun 02 2024 Robert Scheck <robert@fedoraproject.org> 1.9-6
+- Update bundled edk2 to 20240524 (#2284243)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Sep 06 2022 Robert Scheck <robert@fedoraproject.org> 1.9-1
+- Upgrade to 1.9 (#2124389)
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Apr 18 2022 Robert Scheck <robert@fedoraproject.org> 1.8-3
+- Update bundled edk2 to 202202 and add GCC 12 fixes (#2045335)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Aug 21 2021 Robert Scheck <robert@fedoraproject.org> 1.8-1
+- Upgrade to 1.8 (#1996231)
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Sun Nov 29 2020 Robert Scheck <robert@fedoraproject.org> 1.7-2
 - Changes to match the Fedora Packaging Guidelines (#1902498)
 

sources

@@ -1,3 +1,3 @@
-SHA512 (efifs-1.7.tar.gz) = 51ccfdd6514201ed4d8d694e86d108cc6b7057e4a0fc2b85fb3d848315e8a922a164612f4860473074e8fec9b3ef44cf966a5a8787726c624ca8548174de9df9
-SHA512 (edk2-stable202008.tar.gz) = c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
-SHA512 (grub-d7cac52eb21b866ffec66dc8d1319cc0695c94ee.tar.gz) = 098b4c489818fd52fdff3d55eabb9e2f6c31d711039c92a8ebd5affaa2eae5bc659c759df25b63418a7791720ff34de05ffaa9053d18696ac51e551bae66af87
+SHA512 (efifs-1.11.tar.gz) = 2cd91abba8e33fe4e73a2da795b00126232c8fbd5da049255cbc3acc9c94d4c5b7067b1a24eb4403d5c384ca93770eb9a038b854f010238b85a63525c4cc0b3e
+SHA512 (edk2-stable202502.tar.gz) = 1421b3e14acf6aa51c84cf0a12716990f08815fff631f4657bb9907fd8d620e9fac7794e05c2eed54d5f8966f8e9267d32bf2256237a959bd727629163b8c00d
+SHA512 (grub-6811f6f09d61996a3acbc4fc0414e45964f0e2d9.tar.gz) = 73adfc7fd9c13ae40e14049904915e187a7b3ebfbe6a2b5b106df7a650771a384adcd3f907a29370b5194eefeff4011aa90a4d57100ca559c9d87b0c7540e140