diff --git a/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch b/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch new file mode 100644 index 0000000000000000000000000000000000000000..b1aeb557d5f344d497f850b7c757fbab990161a4 --- /dev/null +++ b/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch @@ -0,0 +1,12 @@ +diff -Nuar e2fsprogs-1.44.6.orig/misc/mke2fs.conf.in e2fsprogs-1.44.6/misc/mke2fs.conf.in +--- e2fsprogs-1.44.6.orig/misc/mke2fs.conf.in 2019-03-06 04:11:11.000000000 +0800 ++++ e2fsprogs-1.44.6/misc/mke2fs.conf.in 2020-08-27 15:35:20.508576799 +0800 +@@ -11,7 +11,7 @@ + features = has_journal + } + ext4 = { +- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize ++ features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize + inode_size = 256 + } + rhel6_ext4 = { diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 6cc80859648a9ece6e8aed43f670f6388854f328..4732f929162d00b5d65b905c20ae435ce2e60798 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs Version: 1.45.6 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -35,6 +36,10 @@ Patch4: e2fsprogs-1.45.6-Revert-libext2fs-revamp-bitmap-types-to-fix-LTO-warn.pa Patch5: e2fsprogs-1.45.6-Revert-libext2fs-hide-struct-ext2fs_hashmap-as-an-in.patch Patch6: e2fsprogs-1.45.6-ext2fs-fix-ABI-change-in-the-struct_ext2_filsys-stru.patch +# Begin: Anolis customized patches +Patch1001: 1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch +# End: Anolis customized patches + %description The e2fsprogs package contains a number of utilities for creating, checking, modifying, and correcting any inconsistencies in second, @@ -159,6 +164,7 @@ It was originally inspired by the Multics SubSystem library. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch1001 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -321,6 +327,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Tue Nov 23 2021 Weitao Zhou 1.45.6-5.0.1 +- Disable metadata_csum for ext4 by default + * Wed Jun 03 2020 Lukas Czerner 1.45.6-5 - Rebase to the upstream release 1.45.6 (#1843548)