From c5e9dc99af7a688821e6facc57d92b2141c59717 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:46:08 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- efifs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efifs.spec b/efifs.spec index 723e992..d5547c1 100644 --- a/efifs.spec +++ b/efifs.spec @@ -15,7 +15,7 @@ Summary: Free software EFI/UEFI standalone file system drivers Name: efifs Version: 1.9 -Release: 6%{?dist} +Release: 7%{?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 @@ -102,6 +102,9 @@ install -p -m 0700 edk2-%{edk2_stable_str}/Build/EfiFs/RELEASE_GCC5/%{efi_arch_u %{efi_esp_dir}/ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 02 2024 Robert Scheck 1.9-6 - Update bundled edk2 to 20240524 (#2284243) From 95602002b87e095458f7391ab69a7a8e9ced1876 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 1 Dec 2024 01:31:01 +0100 Subject: [PATCH 2/5] Upgrade to 1.11 (#2290813) --- README.md | 2 +- efifs.spec | 34 +++++++++++++++++++++++----------- sources | 6 +++--- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 864a430..2ecbc34 100644 --- a/README.md +++ b/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. \ No newline at end of file +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. \ No newline at end of file diff --git a/efifs.spec b/efifs.spec index d5547c1..45e1e3e 100644 --- a/efifs.spec +++ b/efifs.spec @@ -5,17 +5,17 @@ %global efi_vendor %{name} # Git commit mentioned at https://github.com/pbatard/efifs -%global grub2_version 2.11-0 -%global grub2_commit d9b4638c50b16d4722e66d334e2c1a674b4a45cc +%global grub2_version 2.13-0 +%global grub2_commit 6811f6f09d61996a3acbc4fc0414e45964f0e2d9 # Preferrably the latest stable version shipped in Fedora -%global edk2_stable_date 20240524 +%global edk2_stable_date 20241117 %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.9 -Release: 7%{?dist} +Version: 1.11 +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 @@ -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 @@ -42,15 +46,16 @@ Provides: bundled(grub2-efi-modules) = %{grub2_version}.git%(c=%{grub2_com 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} @@ -74,6 +79,10 @@ 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" @@ -102,6 +111,9 @@ install -p -m 0700 edk2-%{edk2_stable_str}/Build/EfiFs/RELEASE_GCC5/%{efi_arch_u %{efi_esp_dir}/ %changelog +* Sun Dec 01 2024 Robert Scheck 1.11-1 +- Upgrade to 1.11 (#2290813) + * Wed Jul 17 2024 Fedora Release Engineering - 1.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 76000c0..b13eecb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (efifs-1.9.tar.gz) = 5bca4eb4bc72b2a72f68176b4b47bafdbb962afea4b1c6af0e3144d388b2d3d64487b150b86af62edfabe819da8dd92961391fbe67bdf15f84f64875983efa72 -SHA512 (edk2-stable202405.tar.gz) = 3bad4c8417b0c9b68fc6b6b85a4b15c5be8daf672177ce66d7b224b1da7a90f643021adbdd6bc96f95417fc8654c4c6b191cd39f6c1be955946360bfa8e2cb5f -SHA512 (grub-d9b4638c50b16d4722e66d334e2c1a674b4a45cc.tar.gz) = 98edf3ec68d342ff2b0bcccfe07e9d7a0f8bf43079ad3dfef250d997b9606154759cfecfd7c450e0ad7b1ce272cf855e05b60f1eb55f50779f34fc748015a4f5 +SHA512 (efifs-1.11.tar.gz) = 2cd91abba8e33fe4e73a2da795b00126232c8fbd5da049255cbc3acc9c94d4c5b7067b1a24eb4403d5c384ca93770eb9a038b854f010238b85a63525c4cc0b3e +SHA512 (edk2-stable202411.tar.gz) = 633483a1ff915f6e5f5a6d3c329f517d6c070368855f1d5348a80e22e71ac13ff4c6774c8620482a4e5cefe03907edc3a904ae405cbfe2dcd025ddd82f039eaf +SHA512 (grub-6811f6f09d61996a3acbc4fc0414e45964f0e2d9.tar.gz) = 73adfc7fd9c13ae40e14049904915e187a7b3ebfbe6a2b5b106df7a650771a384adcd3f907a29370b5194eefeff4011aa90a4d57100ca559c9d87b0c7540e140 From 6a8cd245fd6552c4f97b18191abaca69f97b3782 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:40:58 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- efifs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efifs.spec b/efifs.spec index 45e1e3e..05d7c3b 100644 --- a/efifs.spec +++ b/efifs.spec @@ -15,7 +15,7 @@ Summary: Free software EFI/UEFI standalone file system drivers Name: efifs Version: 1.11 -Release: 1%{?dist} +Release: 2%{?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 @@ -111,6 +111,9 @@ install -p -m 0700 edk2-%{edk2_stable_str}/Build/EfiFs/RELEASE_GCC5/%{efi_arch_u %{efi_esp_dir}/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 01 2024 Robert Scheck 1.11-1 - Upgrade to 1.11 (#2290813) From c7d7b8ae3521e1eab121db5f0094c0ef7850d1e4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 17 May 2025 22:34:20 +0200 Subject: [PATCH 4/5] Update bundled edk2 to 20250221 (#2340114) --- efifs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/efifs.spec b/efifs.spec index 05d7c3b..876f454 100644 --- a/efifs.spec +++ b/efifs.spec @@ -9,13 +9,13 @@ %global grub2_commit 6811f6f09d61996a3acbc4fc0414e45964f0e2d9 # Preferrably the latest stable version shipped in Fedora -%global edk2_stable_date 20241117 +%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.11 -Release: 2%{?dist} +Release: 3%{?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 @@ -111,6 +111,9 @@ install -p -m 0700 edk2-%{edk2_stable_str}/Build/EfiFs/RELEASE_GCC5/%{efi_arch_u %{efi_esp_dir}/ %changelog +* Sat May 17 2025 Robert Scheck 1.11-3 +- Update bundled edk2 to 20250221 (#2340114) + * Thu Jan 16 2025 Fedora Release Engineering - 1.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index b13eecb..70ae576 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (efifs-1.11.tar.gz) = 2cd91abba8e33fe4e73a2da795b00126232c8fbd5da049255cbc3acc9c94d4c5b7067b1a24eb4403d5c384ca93770eb9a038b854f010238b85a63525c4cc0b3e -SHA512 (edk2-stable202411.tar.gz) = 633483a1ff915f6e5f5a6d3c329f517d6c070368855f1d5348a80e22e71ac13ff4c6774c8620482a4e5cefe03907edc3a904ae405cbfe2dcd025ddd82f039eaf +SHA512 (edk2-stable202502.tar.gz) = 1421b3e14acf6aa51c84cf0a12716990f08815fff631f4657bb9907fd8d620e9fac7794e05c2eed54d5f8966f8e9267d32bf2256237a959bd727629163b8c00d SHA512 (grub-6811f6f09d61996a3acbc4fc0414e45964f0e2d9.tar.gz) = 73adfc7fd9c13ae40e14049904915e187a7b3ebfbe6a2b5b106df7a650771a384adcd3f907a29370b5194eefeff4011aa90a4d57100ca559c9d87b0c7540e140 From 7a948a856ff219964897a6d39a6021a6c6e342ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:43:55 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- efifs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efifs.spec b/efifs.spec index 876f454..948a61b 100644 --- a/efifs.spec +++ b/efifs.spec @@ -15,7 +15,7 @@ Summary: Free software EFI/UEFI standalone file system drivers Name: efifs Version: 1.11 -Release: 3%{?dist} +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 @@ -111,6 +111,9 @@ 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 - 1.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat May 17 2025 Robert Scheck 1.11-3 - Update bundled edk2 to 20250221 (#2340114)