Accepting request 584277 from filesystems

OBS-URL: https://build.opensuse.org/request/show/584277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2018-03-12 11:07:58 +00:00 committed by Git OBS Bridge
commit 8a5dd6eaf0
8 changed files with 70 additions and 80 deletions

View File

@ -0,0 +1,10 @@
diff --git a/scrub/xfs_scrub_all.in b/scrub/xfs_scrub_all.in
index fff05da3ea7a..80f07d5c8b02 100644
--- a/scrub/xfs_scrub_all.in
+++ b/scrub/xfs_scrub_all.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
# Run online scrubbers in parallel, but avoid thrashing.
#

View File

@ -1,55 +0,0 @@
From: Darrick J. Wong <darrick.wong@oracle.com>
Subject: xfs_io: fix copy_file_range symbol name collision
References: bsc#1079756
Patch-mainline: https://www.spinics.net/lists/linux-xfs/msg15553.html
glibc 2.27 has a copy_file_range wrapper, so we need to change our
internal function out of the way to avoid compiler warnings.
Reported-by: fredrik@crux.nu
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
io/copy_file_range.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/io/copy_file_range.c b/io/copy_file_range.c
index d1dfc5a..99fba20 100644
--- a/io/copy_file_range.c
+++ b/io/copy_file_range.c
@@ -42,13 +42,18 @@ copy_range_help(void)
"));
}
+/*
+ * Issue a raw copy_file_range syscall; for our test program we don't want the
+ * glibc buffered copy fallback.
+ */
static loff_t
-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
+copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
{
loff_t ret;
do {
- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
+ ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
+ len, 0);
if (ret == -1) {
perror("copy_range");
return errno;
@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
copy_dst_truncate();
}
- ret = copy_file_range(fd, &src, &dst, len);
+ ret = copy_file_range_cmd(fd, &src, &dst, len);
close(fd);
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQIcBAABAgAGBQJaHEVNAAoJECCuFpLhPd7gJZ4QALgMWM2JEGa0Y9QewhV/HdC7
X5lRWXsRnHB31yPg/Uc1uP/yWrbOnvaHCfgnEHUikbCPuymAyI1C0m2gICDa1e66
udtEHUgSv1TUtbooS52TrbCHEo9IFVNkfvWFVg2dwYgydtr4z+Fq2AbCe2Fk+Y1d
UrHfQYPMgJ/1x1DKHuol/i9CtwJPWbFmWrLcoNixnasSFPiyj4UiF1C7k/7tdKZC
lQaWkul9vwNesbarAIOzl8DlQYSEUrTv8vSAVy1fHek665cKDsQiXtb4LDt+6hdN
Nx9xGIGcwsMi28RA4aE2hra/WDXs420G2pSYA3W5Hd5R+4Qk9X3rXIi5lkoB60rp
BSD5TfsmJJFpnRw6bkf9Jhit3TjDIK286rN+LFCo2g0oepysbnSi4S2jDER5u7wp
+51js1UlB9ormDl09QeIBa+IMVRkolmbM5X/gEd7WX1YZTZYldvaDn432AjyJ0io
b8xYqcULgYchkyNi8mLzV7YlWJaHCJUNl1CGN+SeBRKlvquXZnTuthgXVaZh0i1r
2TgJFIYvVixeC/VLZIu1W9UWggap0zIiwYIcP63WLYUCyvbqF8Xl7eK/fQsmK8Ab
Lz6n4t04u6cpFAk7w6X4DW9zUrQYblyk2fYmcGsMOU5e1D7ZGRba4eTdjYDAY3Yx
JdiUGqrIKYfvj1NdLaye
=rvCY
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec
size 1137048

17
xfsprogs-4.15.1.tar.sign Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQIcBAABAgAGBQJalL8QAAoJECCuFpLhPd7gjgwQAJ7yXVQ3M/ZAIQ+Qi1y4qc1s
mNz8qjxrrWLqkWa1Pl3bcpGv/VuULoTT7XUF66AL7S2O44xioQ2KrJ/NCLWQ/9Ai
hI+kw0EIGzwZh1Crj86vUA9TeAV59qme8wWL3saqtvjnLfcVdwlPkXAviOwaEx+Z
qYYkhyFUGQFqxgQxnK5iAqeNDDWb8Xuy0NVahTcWOQGKaHXnyUvRmyEcHlHzjN/b
Sn0GCySSwtzu2rk0j0Wg3xqUcLUDPyt4kQ+6/temgJmiqkHVqkiku2YfLFJCTuKC
QrnhPqSRTqkTLRnCyrjoFENdnSfEFE9AO4tUQwc5DJoTMsXk9X9cVHdRO4D7F7Tj
55ENcm39DnH3g7xogsIE/pQD4VHgs68Ye65szERZ15JelOuGFTJj/mfayJz2b5Gb
vXVa5EvQ8GVanDIo/Yz5adqG605cNJw0SH3Q/vPBPQ47tM3Xqx4QwLHVVnIybjJr
du8Rm5GL+kiI9jel+INP2orlc3VnuWA81vQmkgr0OkcWuHTRfBYr6EA9GsYpkJ8q
EbDu+kGW5nOANljXwdQ8cJI7fo5MhJkUf8+7XaFJMYpN99ny7TnmFbBUGGfeHGnH
UWmGwOxIsnB+IAuUktnD40v8YdQtI6cWMO69dIjAH3ACj74gFOS91tzyOLng9IVZ
9/TrDZb8EeVD6JROortO
=LHS8
-----END PGP SIGNATURE-----

3
xfsprogs-4.15.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27c36de9346a274143ad06c65b2fdbafd2806f3f37fa2c1235a08ed920d2bf3c
size 1188964

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Wed Mar 7 19:51:21 UTC 2018 - lurodriguez@suse.com
- Bump release to v4.15.1, which has these minor fixes:
* po/pl.po: update Polish translation for 4.15.0
* debian: don't fail postinst when upgrading chroot
* debian: add build-depends on pkg-config
-------------------------------------------------------------------
Wed Mar 7 19:26:57 UTC 2018 - lurodriguez@suse.com
- Fix build on SLE11-SP4 by making the m4 macros required available.
-------------------------------------------------------------------
Sat Feb 24 01:18:02 UTC 2018 - lurodriguez@suse.com
- drops drop xfs_io-fix-copy_file_range-symbol-name-collision.patch,
this is now part of this release.
- adds make_xfs_scrub_interp_explicit.patch, rpm lint complains about
using env python, when this is used the dependency checker for rpm
will not be able to resolve dependencies correctly, so an explicit
interpreter is needed.
- Update to v4.15.0:
* xfs_scrub: experimental new tool added
* xfs_metadump: fix issues with -i flag
* mkfs.xfs: don't allow creation of realtime+reflink
* mkfs.xfs: don't crash on dswidth overflow
* mkfs.xfs: much refactoring
* xfs_copy: fix copy of v5 filesystems
* xfs_io: add a new 'log_writes' command
* xfs_io: add MAP_SYNC support to mmap()
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 7 14:24:01 UTC 2018 - jeffm@suse.com Wed Feb 7 14:24:01 UTC 2018 - jeffm@suse.com

View File

@ -19,10 +19,10 @@
%define _dracutmodulesdir %{_libexecdir}/dracut/modules.d %define _dracutmodulesdir %{_libexecdir}/dracut/modules.d
Name: xfsprogs Name: xfsprogs
Version: 4.14.0 Version: 4.15.1
Release: 0 Release: 0
Summary: Utilities for managing the XFS file system Summary: Utilities for managing the XFS file system
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Filesystems Group: System/Filesystems
Url: http://xfs.org Url: http://xfs.org
Source0: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-%{version}.tar.xz Source0: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-%{version}.tar.xz
@ -31,10 +31,11 @@ Source2: %{name}.keyring
Source3: module-setup.sh.in Source3: module-setup.sh.in
Source4: dracut-fsck-help.txt Source4: dracut-fsck-help.txt
Patch0: xfsprogs-docdir.diff Patch0: xfsprogs-docdir.diff
Patch1: xfs_io-fix-copy_file_range-symbol-name-collision.patch Patch1: make_xfs_scrub_interp_explicit.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libblkid-devel BuildRequires: libblkid-devel
BuildRequires: pkg-config
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
@ -54,7 +55,7 @@ A set of commands to use the XFS file system, including mkfs.xfs.
XFS is a high performance journaling file system which originated on XFS is a high performance journaling file system which originated on
the SGI IRIX platform. It is completely multithreaded. It can support the SGI IRIX platform. It is completely multithreaded. It can support
large files and large file systems, extended attributes, and variable large files and large file systems, extended attributes, and variable
block sizes.It is extent based and makes extensive use of Btrees block sizes. It is extent based and makes extensive use of Btrees
(directories, extents, and free space) to aid both performance and (directories, extents, and free space) to aid both performance and
scalability. scalability.
@ -134,7 +135,9 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
%{_sbindir}/* %{_sbindir}/*
# this is only used by xfs cmds, therefore no urgent need for a shlib package # this is only used by xfs cmds, therefore no urgent need for a shlib package
%{_libdir}/libhandle.so.* %{_libdir}/libhandle.so.*
%doc %{_mandir}/man[58]/* %dir %{_libdir}/xfsprogs/
%{_libdir}/xfsprogs/xfs_scrub_all.cron
%doc %{_mandir}/man[258]/*
%doc %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}
%dir %{_libexecdir}/dracut %dir %{_libexecdir}/dracut
%dir %{_libexecdir}/dracut/modules.d %dir %{_libexecdir}/dracut/modules.d