From 69d511e94706537f8b8359766e4a4937c47de8a5 Mon Sep 17 00:00:00 2001 From: wzx Date: Wed, 26 Oct 2022 11:31:24 +0800 Subject: [PATCH] Add sw64 architecture Signed-off-by: wzx (cherry picked from commit b7d2a5695f4a9acb9e12141c295fa52a70a30594) --- 0004-xfsprogs-Add-sw64-architecture.patch | 37 +++++++++++++++++++++++ xfsprogs.spec | 6 +++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0004-xfsprogs-Add-sw64-architecture.patch diff --git a/0004-xfsprogs-Add-sw64-architecture.patch b/0004-xfsprogs-Add-sw64-architecture.patch new file mode 100644 index 0000000..003e40f --- /dev/null +++ b/0004-xfsprogs-Add-sw64-architecture.patch @@ -0,0 +1,37 @@ +From 2e7288a16fedf40326641cb7928d6f1dc4ef3185 Mon Sep 17 00:00:00 2001 +From: wzx +Date: Wed, 26 Oct 2022 11:27:26 +0800 +Subject: [PATCH] Add sw64 architecture + +Add sw64 architecture in file open.c to support sw64 architecture. + +Signed-off-by: wzx +--- + io/open.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/io/open.c b/io/open.c +index d807266..e7329a8 100644 +--- a/io/open.c ++++ b/io/open.c +@@ -14,7 +14,7 @@ + #include "libfrog/bulkstat.h" + + #ifndef __O_TMPFILE +-#if defined __alpha__ ++#if defined __alpha__ || defined __sw_64__ + #define __O_TMPFILE 0100000000 + #elif defined(__hppa__) + #define __O_TMPFILE 040000000 +@@ -30,7 +30,7 @@ + #endif + + #ifndef O_PATH +-#if defined __alpha__ ++#if defined __alpha__ || defined __sw_64__ + #define O_PATH 040000000 + #elif defined(__hppa__) + #define O_PATH 020000000 +-- +2.33.0 + diff --git a/xfsprogs.spec b/xfsprogs.spec index 69ca297..f686bcb 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,6 +1,6 @@ Name: xfsprogs Version: 5.14.1 -Release: 5 +Release: 6 Summary: Administration and debugging tools for the XFS file system License: GPL+ and LGPLv2+ URL: https://xfs.wiki.kernel.org @@ -21,6 +21,7 @@ Patch0: xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch Patch1: 0001-xfs-correct-nlink-printf-specifier-from-hd-to-PRIu32.patch Patch2: 0002-libxfs-fix-inode-reservation-space-for-removing-tran.patch Patch3: 0003-mkfs-prevent-corruption-of-passed-in-suboption-strin.patch +Patch4: 0004-xfsprogs-Add-sw64-architecture.patch %description xfsprogs are the userspace utilities that manage XFS filesystems. @@ -104,6 +105,9 @@ rm -rf %{buildroot}%{_datadir}/doc/xfsprogs/ %changelog +* Wed Oct 26 2022 wuzx - 5.14.1-6 +- Add sw64 architecture + * Wed Sep 28 2022 Jun Yang - 5.14.1-5 - add Patch3: prevent corruption of passed-in suboption string values -- Gitee