From 31db7cfcef784795e36d885b90c988a30cf8174b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 01 2022 18:06:02 +0000 Subject: import xfsprogs-5.12.0-5.el9 --- diff --git a/SOURCES/rhel8.0.conf b/SOURCES/rhel8.0.conf new file mode 100644 index 0000000..c01f532 --- /dev/null +++ b/SOURCES/rhel8.0.conf @@ -0,0 +1,9 @@ +# This is a sample mkfs.xfs config file that creates rhel-8 compatible +# XFS filesystem on rhel-9 +# Usage: +# mkfs.xfs -c options=rhel8.0.conf device +# +[metadata] +inobtcount=0 +bigtime=0 + diff --git a/SOURCES/xfsprogs-5.12.0-example-conf.patch b/SOURCES/xfsprogs-5.12.0-example-conf.patch new file mode 100644 index 0000000..ca06875 --- /dev/null +++ b/SOURCES/xfsprogs-5.12.0-example-conf.patch @@ -0,0 +1,15 @@ +--- xfsprogs-5.12.0/man/man8/mkfs.xfs.8.backup 2021-12-01 20:48:09.241170607 +0100 ++++ xfsprogs-5.12.0/man/man8/mkfs.xfs.8 2021-12-03 15:34:32.382616819 +0100 +@@ -1091,6 +1091,12 @@ + .HP + .PD + .PP ++.SH Example Of Backward Compatible Configuration Files ++An example of a configuration file that facilitates creation of Red Hat ++Enterprise Linux 8 compatible XFS filesystems while running on Red Hat ++Enterprise Linux 9 can be found at: ++/usr/share/xfsprogs/mkfs/rhel8.0.conf ++.PP + .SH SEE ALSO + .BR xfs (5), + .BR mkfs (8), diff --git a/SPECS/xfsprogs.spec b/SPECS/xfsprogs.spec index b6ea8b2..a3e900a 100644 --- a/SPECS/xfsprogs.spec +++ b/SPECS/xfsprogs.spec @@ -1,12 +1,13 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs Version: 5.12.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ and LGPLv2+ URL: https://xfs.wiki.kernel.org Source0: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz Source1: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.sign Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/20AE1692E13DDEE0.asc +Source3: rhel8.0.conf Requires: util-linux BuildRequires: make BuildRequires: gcc @@ -22,6 +23,7 @@ Conflicts: xfsdump < 3.0.1 Suggests: xfsprogs-xfs_scrub Patch0: xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch +Patch1: xfsprogs-5.12.0-example-conf.patch %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -81,6 +83,11 @@ rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}} # remove non-versioned docs location rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ +# add backward compatible configure file for mkfs +%global mkfsdir %{_datadir}/xfsprogs/mkfs +install -m 0755 -d %{buildroot}%{mkfsdir} +install -m 0644 %{SOURCE3} %{buildroot}%{mkfsdir} + %find_lang %{name} %ldconfig_scriptlets @@ -94,6 +101,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ %{_mandir}/man8/* %{_sbindir}/* %{_unitdir}/* +%{mkfsdir} %exclude %{_sbindir}/xfs_scrub* %exclude %{_mandir}/man8/xfs_scrub* %exclude %{_usr}/%{_lib}/xfsprogs/xfs_scrub* @@ -127,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ %{_libdir}/*.so %changelog +* Wed Dec 01 2021 Pavel Reichl - 5.12.0-5 +- Add an example of backward compatible conf. file for mkfs + Related: rhbz#2026002 + * Tue Aug 10 2021 Mohan Boddu - 5.12.0-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688