pool/xfsprogs
3
0
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 621763 from filesystems

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/621763
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2018-07-13 08:17:36 +00:00 committed by Git OBS Bridge
commit 36bc67d23e
7 changed files with 163 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make_xfs_scrub_interp_explicit.patch
View File

@ -1,10 +0,0 @@
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.
#

17
xfsprogs-4.15.1.tar.sign
View File

@ -1,17 +0,0 @@
-----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
View File

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

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

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQIcBAABAgAGBQJa59q/AAoJECCuFpLhPd7gcwIQAJrN1TcTAHck+u/6z/CpaO/0
bXqUn0CZqMCuZPBWiovIJyLeS6qBkDJ55VWFcc8zxNCjdzrNWV2xr34fYyF0vBXQ
rGbuedzTiQDs+T3OQNKDVZyQWh0S9SbKZAeCxMIA4deGWckji8N75TMruYGagjuv
YeesetmGal4xxaCieKjWbkRwQYATRszSXWGtKWnW4Q0iSESuZzIggfKbrFrUJUmu
DMQwSj+R5ybRkj7b20tosztHl0nVoKsTF+pqp1fLDEYjZ0QX9bjKPpQpgvk5u7k/
rfeZeToSoYXUl4qmGdeOQgpZeMLRKGdPXu7HY/gJpieqI5RN29wMVsC1iC13ojHl
4jorpRBwVHAZYOlDHD21n1W5A5oohMXChy3LVwRzXx4NrALIV69mbpe9W9x/e4Px
lpOrNxoqmCpge4uU67c8OcWHPXidur2l/kYkatWZ+6S1ICYR+rJNEyKkKAJDvRQh
7JBdpmJceCMio2+2RI+/UHkRlkCaiZww8FQVMQWUrVxroN1nkoEX+rZwcttJ/zzj
sN3LFE/GyAxxcBux4XhVgK9Z+BMou1RXCir4utoISnmg6d5dT3fwASAPZgdc7qIv
TXOHNTM6UZlYQOvOsj+z6cBMdwPfBDHhpT9qHvIUQ2XFEAh6OmBFIgb1nPX+cJTl
GSuqaPvYTsM9D785VAyg
=sxJN
-----END PGP SIGNATURE-----

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

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

70
xfsprogs.changes
View File

@ -1,3 +1,73 @@
-------------------------------------------------------------------
Tue Jul 3 12:14:02 UTC 2018 - tchvatal@suse.com
- Require %libname in the develpackage to not have dangling symlink
and actually work
-------------------------------------------------------------------
Thu May 24 19:38:41 UTC 2018 - tchvatal@suse.com
- Fix build for SLE11 again
-------------------------------------------------------------------
Thu May 24 14:29:20 CEST 2018 - kukuk@suse.de
- Use %license instead of %doc [bsc#1082318]
-------------------------------------------------------------------
Tue May 22 13:49:03 UTC 2018 - tchvatal@suse.com
- Do not probe for lto on older GCCs as it exposes errors that
might cause random runtime issues
-------------------------------------------------------------------
Wed May 16 12:31:58 UTC 2018 - tchvatal@suse.com
- Do not distribute static libraries they are not needed
- Remove the crazy part about avoiding shared library policies
it does work on SLE11 even if it is not mandated
- Make sure to run only proper parts of services on reloads for
xfs unitfiles
-------------------------------------------------------------------
Thu May 10 23:48:29 UTC 2018 - lurodriguez@suse.com
- Remove xfsprogs.spec useless blunder (bsc#1092843)
-------------------------------------------------------------------
Tue May 8 22:35:08 UTC 2018 - lurodriguez@suse.com
- Fix OpenSUSE Tumbleweed package build (bsc#1091300) due to the libhandle1
library shared object (so) name expectations, this is documented here:
https://en.opensuse.org/openSUSE:Shared_library_packaging_policy
- Move systemd check to use a macro, to make it clear when the check is
used and for what purpose exactly. Perhaps this should be moved later
into a generic OpenSUSE/SUSE macro as a generic check as I suspect tons
of other rpms will likely need the same.
- Address -Werror errors on old compilers, for the life of me I can't see
how xfsprogs is at fault, so just disable -Werror on older compilers for
now. In the future we can consider adding a work around for the compiler
instead of disabling -Werror entirely, but for now this is the best I can
come up with.
- Drop make_xfs_scrub_interp_explicit.patch, this is now upstream
- Update to v4.16.1 (using verbiage from xfsprogs/doc/CHANGES now):
* fsck.xfs: remove bashism which may interfere with boot (Eric Sandeen)
* platforms: warn of impending deprecation of irix, freebsd, darwin
* mkfs.xfs : enable sparse inodes by default (Darrick Wong)
* fsck.xfs: allow forced boot-time repairs using xfs_repair (Jan Tulak)
* xfs_repair: new -e flag alters exit code for fixed errors (Jan Tulak)
* xfs_repair: fix to allow zeroing of corrupt log (Xiao Yang)
* xfs_repair: remove old dead code (Eric Sandeen)
* xfs_io: fix operation time reporting (Dave Chinner)
* xfs_io: add RWF_DSYNC support to pwrite (Dave Chinner)
* xfs_io: support a basic extent swap command (Brian Foster)
* xfs_scrub: Many updates, still experimental (Darrick Wong)
* xfs_db: print transaction reservation type information
* libxfs: framework to detect memory leaks (Eric Sandeen)
* misc: Fix up new warnings from gcc 7.3 (Darrick Wong)
* misc: enable link time optimization, if requested (Darrick Wong)
* misc: enable retpolines across all xfsprogs utilities (Darrick Wong)
-------------------------------------------------------------------
Thu Apr 19 20:46:25 UTC 2018 - lurodriguez@suse.com

115
xfsprogs.spec
View File

@ -17,42 +17,44 @@
%define _dracutmodulesdir %{_libexecdir}/dracut/modules.d
# make sure we use systemd services on products where it is available
%if 0%{?suse_version} >= 1210
%bcond_without systemd
%else
%bcond_with systemd
%endif
%define libname libhandle1
Name: xfsprogs
Version: 4.15.1
Version: 4.16.1
Release: 0
Summary: Utilities for managing the XFS file system
License: GPL-2.0-or-later
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
Source1: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-%{version}.tar.sign
Source2: %{name}.keyring
Source3: module-setup.sh.in
Source4: dracut-fsck-help.txt
Patch0: xfsprogs-docdir.diff
Patch1: make_xfs_scrub_interp_explicit.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libblkid-devel
BuildRequires: pkg-config
BuildRequires: readline-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libuuid-devel
%if 0%{?suse_version} >= 1010
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils
# hint for ZYPP
Supplements: filesystem(xfs)
%endif
%if 0%{?suse_version} >= 1310
BuildRequires: suse-module-tools
%endif
BuildRequires: xz
Requires(post): coreutils
# Starting with OpenSUSE Leap 42.1 and SLE12-SP1 we get systemd
%if 0%{?sle_version} >= 120100
BuildRequires: pkgconfig
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
%endif
%description
A set of commands to use the XFS file system, including mkfs.xfs.
@ -67,9 +69,21 @@ Refer to the documentation at http://oss.sgi.com/projects/xfs/ for
complete details. This implementation is on-disk compatible with the
IRIX version of XFS.
%package -n %{libname}
Summary: XFS Filesystem-specific Shared library
Group: Development/Libraries/C and C++
%description -n %{libname}
%{libname} contains the shared libraries needed by xfsprogs
to run xfsprogs programs.
%{libname} is always needed by xfsprogs. If you want to use this
library for your own new xfs tools install xfsprogs-devel.
%package devel
Summary: XFS Filesystem-specific Static Libraries and Headers
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: xfsprogs = %{version}
Requires: pkgconfig(uuid)
@ -83,10 +97,7 @@ want to install xfsprogs.
%prep
%setup -q
%if 0%{?suse_version}
%patch0 -p1
%patch1 -p1
%endif
%build
aclocal -I m4
@ -95,10 +106,16 @@ autoconf
export OPTIMIZER="-fPIC"
export DEBUG=-DNDEBUG
export LIBUUID=%{_libdir}/libuuid.a
%if 0%{?sle_version} >= 120100
export USE_SYSTEMD="--with-systemd-unit-dir=%{_unitdir}"
%configure \
--enable-readline=yes \
%if %{with systemd}
--with-systemd-unit-dir=%{_unitdir} \
%endif
%configure --enable-readline=yes $USE_SYSTEMD
%if 0%{?suse_version} < 1500
--disable-lto \
%endif
%{nil}
make %{?_smp_mflags} V=1
PATH_TO_HELP="%{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt"
@ -106,34 +123,45 @@ sed -e "s|@@PATH_TO_HELP@@|$PATH_TO_HELP|" %{SOURCE3} > module-setup.sh
%install
export DIST_ROOT=%{buildroot}
make install
%make_install
make install-dev
# Move libhandle to usr, libhandle.{a,la} are symlinks to usr/lib* already so
# remove them first.
rm %{buildroot}/%{_lib}/libhandle.a
rm %{buildroot}/%{_lib}/libhandle.la
# installed by %license macro
%if 0%{?suse_version} < 1315
rm %{buildroot}%{_defaultdocdir}/%{name}/COPYING
%endif
# remove the static libs and libtool archive
rm -rf %{buildroot}/%{_lib}/*.{la,a}
rm -rf %{buildroot}/%{_libdir}/*.{la,a}
mv %{buildroot}/%{_lib}/* %{buildroot}%{_libdir}
%find_lang %{name}
install -m 0755 -d %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
install -m 0755 module-setup.sh %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
%if 0%{?suse_version} >= 1310
%if %{with systemd}
%pre
%service_add_pre xfs_scrub_all.service xfs_scrub_all.timer
%post
%{?regenerate_initrd_post}
/sbin/ldconfig
%service_add_post xfs_scrub_all.service xfs_scrub_all.timer
%preun
%service_del_preun xfs_scrub_all.service xfs_scrub_all.timer
%postun
%service_del_postun xfs_scrub_all.service xfs_scrub_all.timer
%endif
%post -n %{libname}
%{?regenerate_initrd_post}
/sbin/ldconfig
%posttrans
%{?regenerate_initrd_posttrans}
%else
%post -p /sbin/ldconfig
%postun -n %{libname}
%{?regenerate_initrd_post}
/sbin/ldconfig
%postun -p /sbin/ldconfig
%endif
%posttrans -n %{libname}
%{?regenerate_initrd_posttrans}
%files -f %{name}.lang
%defattr(-,root,root,755)
@ -141,31 +169,34 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
/sbin/*
#EndUsrMerge
%{_sbindir}/*
# this is only used by xfs cmds, therefore no urgent need for a shlib package
%{_libdir}/libhandle.so.*
%dir %{_libdir}/xfsprogs/
%{_libdir}/xfsprogs/xfs_scrub_all.cron
%if 0%{?sle_version} >= 120100
%if %{with systemd}
%{_libdir}/xfsprogs/xfs_scrub_fail
%{_unitdir}/xfs_scrub@.service
%{_unitdir}/xfs_scrub_all.service
%{_unitdir}/xfs_scrub_all.timer
%{_unitdir}/xfs_scrub_fail@.service
%endif
%doc %{_mandir}/man[258]/*
%{_mandir}/man[258]/*
%doc %{_defaultdocdir}/%{name}
%if 0%{?suse_version} >= 1315
%license doc/COPYING
%endif
%dir %{_libexecdir}/dracut
%dir %{_libexecdir}/dracut/modules.d
%dir %{_dracutmodulesdir}/95suse-xfs/
%{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt
%{_dracutmodulesdir}/95suse-xfs/module-setup.sh
%files devel
%files -n %{libname}
%defattr(-,root,root,755)
%{_libdir}/libhandle.so.*
%files -n xfsprogs-devel
%defattr(-,root,root,755)
%{_includedir}/xfs
%{_libdir}/*.so
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/libhandle.so
%{_mandir}/man3/*
%changelog