diff --git a/e2fsprogs-1.46.0-sw.patch b/e2fsprogs-1.46.0-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..8ff68ab7d2d8cd54f10e7d82122765ea28ffd13f --- /dev/null +++ b/e2fsprogs-1.46.0-sw.patch @@ -0,0 +1,120 @@ +diff -Naur e2fsprogs-1.46.0.org/aclocal.m4 e2fsprogs-1.46.0.sw/aclocal.m4 +--- e2fsprogs-1.46.0.org/aclocal.m4 2021-01-30 06:02:31.000000000 +0800 ++++ e2fsprogs-1.46.0.sw/aclocal.m4 2023-05-15 10:30:36.732214747 +0800 +@@ -978,6 +978,13 @@ + ;; + + changequote(,)dnl ++ sw_64* ) ++changequote([,])dnl ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ ++ ++changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha +@@ -1242,6 +1249,9 @@ + #ifndef __x86_64__ + #undef __x86_64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __alpha__ + #undef __alpha__ + #endif +@@ -1355,7 +1365,7 @@ + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; +- x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) ++ x86_64 | alpha | sw_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; +@@ -1385,7 +1395,7 @@ + + # CPUs that only support a 64-bit ABI. + changequote(,)dnl +- alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ ++ alpha | sw_64 | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + changequote([,])dnl + gl_cv_host_cpu_c_abi_32bit=no +diff -Naur e2fsprogs-1.46.0.org/configure e2fsprogs-1.46.0.sw/configure +--- e2fsprogs-1.46.0.org/configure 2021-01-30 06:02:31.000000000 +0800 ++++ e2fsprogs-1.46.0.sw/configure 2023-05-15 10:32:13.884627483 +0800 +@@ -4452,7 +4452,7 @@ + if test "$GCC" = yes + then + case "$host_cpu" in +- alpha) addcflags="-mieee" ;; ++ alpha | sw_64) addcflags="-mieee" ;; + esac + fi + if test "x$addcflags" != x +@@ -7542,7 +7542,7 @@ + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; +- x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) ++ x86_64 | alpha | sw_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; +diff -Naur e2fsprogs-1.46.0.org/configure.ac e2fsprogs-1.46.0.sw/configure.ac +--- e2fsprogs-1.46.0.org/configure.ac 2021-01-30 06:02:31.000000000 +0800 ++++ e2fsprogs-1.46.0.sw/configure.ac 2023-05-15 10:30:56.830920770 +0800 +@@ -113,7 +113,7 @@ + if test "$GCC" = yes + then + case "$host_cpu" in +- alpha) addcflags="-mieee" ;; ++ alpha | sw_64) addcflags="-mieee" ;; + esac + fi + if test "x$addcflags" != x +diff -Naur e2fsprogs-1.46.0.org/debian/attic/libs/rules e2fsprogs-1.46.0.sw/debian/attic/libs/rules +--- e2fsprogs-1.46.0.org/debian/attic/libs/rules 2021-01-30 06:02:31.000000000 +0800 ++++ e2fsprogs-1.46.0.sw/debian/attic/libs/rules 2023-05-15 10:34:10.450722173 +0800 +@@ -33,6 +33,14 @@ + installdoc = install -m 644 + installbin = install -m 755 + ++ifeq ($(ARCH),sw_64) ++CCOPTS = -g -O2 -fsigned-char -DHAVE_NETINET_IN_H ++LIBC-DEV = libc6.1-dev ++else ++CCOPTS = -g -O2 -fsigned-char ++LIBC-DEV = libc6-dev ++endif ++ + ifeq ($(ARCH),alpha) + CCOPTS = -g -O2 -fsigned-char -DHAVE_NETINET_IN_H + LIBC-DEV = libc6.1-dev +diff -Naur e2fsprogs-1.46.0.org/lib/blkid/llseek.c e2fsprogs-1.46.0.sw/lib/blkid/llseek.c +--- e2fsprogs-1.46.0.org/lib/blkid/llseek.c 2021-01-30 06:02:31.000000000 +0800 ++++ e2fsprogs-1.46.0.sw/lib/blkid/llseek.c 2023-05-15 10:31:23.610861491 +0800 +@@ -88,7 +88,7 @@ + return (retval == -1 ? (blkid_loff_t) retval : result); + } + +-#endif /* __alpha__ || __ia64__ */ ++#endif /* __alpha__ || __sw_64__ || __ia64__ */ + + #endif /* HAVE_LLSEEK */ + +diff -Naur e2fsprogs-1.46.0.org/lib/ext2fs/unix_io.c e2fsprogs-1.46.0.sw/lib/ext2fs/unix_io.c +--- e2fsprogs-1.46.0.org/lib/ext2fs/unix_io.c 2021-01-30 06:02:31.000000000 +0800 ++++ e2fsprogs-1.46.0.sw/lib/ext2fs/unix_io.c 2023-05-15 10:34:28.790366402 +0800 +@@ -742,7 +742,7 @@ + + #ifdef __linux__ + #undef RLIM_INFINITY +-#if (defined(__alpha__) || ((defined(__sparc__) || defined(__mips__)) && (SIZEOF_LONG == 4))) ++#if (defined(__alpha__) || defined(__sw_64__) || ((defined(__sparc__) || defined(__mips__)) && (SIZEOF_LONG == 4))) + #define RLIM_INFINITY ((unsigned long)(~0UL>>1)) + #else + #define RLIM_INFINITY (~0UL) diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 912b2896849cdce8bf5e6e686173334b4d445d0d..a9d70ca6398dcfed7859717cef9e6a1e9607b75e 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs Version: 1.46.0 @@ -49,6 +49,7 @@ Patch1006: 1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch Patch1007: 1007-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch Patch1008: 1008-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch Patch1009: 1009-tests-add-description-for-j_recover_fast_commit.patch +Patch1010: e2fsprogs-1.46.0-sw.patch # End: Anolis customized patches %description @@ -188,6 +189,7 @@ It was originally inspired by the Multics SubSystem library. %patch1007 -p1 %patch1008 -p1 %patch1009 -p1 +%patch1010 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -350,6 +352,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Mon May 15 2023 wxiat 1.4.0-1.0.2 +- add sw patch + * Mon Aug 15 2022 Joseph Qi 1.46.0-1.0.1 - Rebase to upstream release 1.46.0, to support ext4 fast commit