From f2bdceb4ac311a8052778dddf959587209c2b16f Mon Sep 17 00:00:00 2001 From: wxiat Date: Sat, 17 Jun 2023 09:00:40 +0800 Subject: [PATCH] cherry-pick `add sw patch #13b5fb113cae9448eef309499376f44f216552d0`. Signed-off-by: Weisson --- xfsprogs-5.0.0-sw.patch | 21 +++++++++++++++++++++ xfsprogs.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 xfsprogs-5.0.0-sw.patch diff --git a/xfsprogs-5.0.0-sw.patch b/xfsprogs-5.0.0-sw.patch new file mode 100644 index 0000000..49f971b --- /dev/null +++ b/xfsprogs-5.0.0-sw.patch @@ -0,0 +1,21 @@ +diff -Naur xfsprogs-5.0.0.org/io/open.c xfsprogs-5.0.0.sw/io/open.c +--- xfsprogs-5.0.0.org/io/open.c 2019-05-04 04:00:52.000000000 +0800 ++++ xfsprogs-5.0.0.sw/io/open.c 2023-06-17 08:56:25.873186449 +0800 +@@ -11,7 +11,7 @@ + #include "libxfs.h" + + #ifndef __O_TMPFILE +-#if defined __alpha__ ++#if defined __alpha__ || defined __sw_64__ + #define __O_TMPFILE 0100000000 + #elif defined(__hppa__) + #define __O_TMPFILE 040000000 +@@ -27,7 +27,7 @@ + #endif + + #ifndef O_PATH +-#if defined __alpha__ ++#if defined __alpha__ || __sw_64__ + #define O_PATH 040000000 + #elif defined(__hppa__) + #define O_PATH 020000000 diff --git a/xfsprogs.spec b/xfsprogs.spec index 8e9d479..913be57 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 Summary: Utilities for managing the XFS filesystem Name: xfsprogs Version: 5.0.0 @@ -117,6 +117,8 @@ Patch1004: 1004-fsck.xfs-try-to-replay-log-if-dirty-during-xfs_repai.patch Patch1007: 1007-mkfs-fix-missing-validation-of-l-size-against-maximu.patch Patch1008: 1008-mkfs-don-t-let-internal-logs-bump-the-root-dir-inode.patch # End: Anolis customized patches +Patch2000: xfsprogs-5.0.0-sw.patch + %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -229,6 +231,7 @@ Doc pages for %{name}. %patch1004 -p1 %patch1007 -p1 %patch1008 -p1 +%patch2000 -p1 %build export tagname=CC @@ -290,6 +293,9 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/man8/xfs_scrub* %doc doc/CHANGES README %changelog +* Thu Mar 21 2024 wuxiat - 5.0.0-12.0.2 +- cherry-pick `add sw patch #13b5fb113cae9448eef309499376f44f216552d0`. + * Mon Dec 11 2023 liuzhilin - 5.0.0-12.0.1 - Fix gcc10 -fno-common compile issue for compatible with gcc10 build - Add atomic write support (joseph.qi@linux.aliabba.com) -- Gitee