rpms
/
xfsprogs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Tue Oct 02 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-3 

- mkfs.xfs: Fix wiping old AG headers and purge whack buffers

* Mon Oct 01 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-2
- Add alpha to the multilib wrapper (#310411)

* Mon Sep 10 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-1
- Update to xfsprogs 2.9.4

* Fri Aug 24 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-3
- Add gawk to buildrequires

* Thu Aug 16 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-2
- Update license tag

* Thu Jul 26 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-1
- Upgrade to xfsprogs 2.9.2, quota, xfs_repair, and filestreams changes
This commit is contained in:
Eric Sandeen 2007-10-23 16:34:25 +00:00
parent 386abe1448
commit 36ac7b5c2b
5 changed files with 82 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
a40b7d656c9ddb775c3f221433cbf08a xfsprogs_2.8.21-1.tar.gz
174683e3b86b587ed59823fdbbb96ea4 xfsprogs_2.9.4-1.tar.gz

26
xfsprogs-2.8.20-fix-type-test.patch
View File

@ -1,26 +0,0 @@
Index: xfsprogs-2.8.20/aclocal.m4
===================================================================
--- xfsprogs-2.8.20.orig/aclocal.m4
+++ xfsprogs-2.8.20/aclocal.m4
@@ -317,7 +317,7 @@ AC_DEFUN([AC_TYPE_U32],
#include <stddef.h>
], [
__u32 u32;
- ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+ ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
])
#
Index: xfsprogs-2.8.20/m4/package_types.m4
===================================================================
--- xfsprogs-2.8.20.orig/m4/package_types.m4
+++ xfsprogs-2.8.20/m4/package_types.m4
@@ -37,7 +37,7 @@ AC_DEFUN([AC_TYPE_U32],
#include <stddef.h>
], [
__u32 u32;
- ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+ ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
])
#

50
xfsprogs-2.9.4-misc-mkfs-fixes.patch Normal file
View File

@ -0,0 +1,50 @@
To: sgi.bugs.xfs@engr.sgi.com
Cc: xfs@oss.sgi.com
Subject: TAKE 970978 - Fix a couple mkfs.xfs issues
Date: Tue, 25 Sep 2007 13:52:54 +1000 (EST)
From: bnaujok@sgi.com (Barry Naujok)
Fix wiping old AG headers and purge whack buffers
Date: Tue Sep 25 13:52:20 AEST 2007
Workarea: chook.melbourne.sgi.com:/home/bnaujok/isms/xfs-cmds
Inspected by: sandeen@sandeen.net
The following file(s) were checked into:
longdrop.melbourne.sgi.com:/isms/xfs-cmds/master-melb
Modid: master-melb:xfs-cmds:29767a
xfsprogs/mkfs/xfs_mkfs.c - 1.82 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-cmds/xfsprogs/mkfs/xfs_mkfs.c.diff?r1=text&tr1=1.82&r2=text&tr2=1.81&f=h
- Fix wiping old AG headers and purge whack buffers
--- xfsprogs/mkfs/xfs_mkfs.c 2007/07/16 03:56:15 1.81
+++ xfsprogs/mkfs/xfs_mkfs.c 2007/09/25 06:15:37 1.82
@@ -558,15 +558,12 @@ zero_old_xfs_structures(
goto done;
/*
- * block size and basic geometry seems alright, zero the secondaries,
- * but don't go beyond the end of the new filesystem.
+ * block size and basic geometry seems alright, zero the secondaries.
*/
bzero(buf, new_sb->sb_sectsize);
off = 0;
for (i = 1; i < sb.sb_agcount; i++) {
off += sb.sb_agblocks;
- if (off >= new_sb->sb_dblocks)
- break;
if (pwrite64(xi->dfd, buf, new_sb->sb_sectsize,
off << sb.sb_blocklog) == -1)
break;
@@ -2115,6 +2112,7 @@ an AG size that is one stripe unit small
BTOBB(WHACK_SIZE));
bzero(XFS_BUF_PTR(buf), WHACK_SIZE);
libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
+ libxfs_purgebuf(buf);
}
/*

2
xfsprogs-wrapper.h
View File

@ -17,6 +17,8 @@
#include "platform_defs-s390.h"
#elif defined(__x86_64__)
#include "platform_defs-x86_64.h"
#elif defined(__alpha__)
#include "platform_defs-alpha.h"
#else
#error "This xfsprogs-devel package does not work your architecture?"
#endif

37
xfsprogs.spec
View File

@ -1,21 +1,25 @@
Summary: Utilities for managing the XFS filesystem
Name: xfsprogs
Version: 2.8.21
Release: 1%{?dist}
License: GPL
Version: 2.9.4
Release: 3%{?dist}
# Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
# in source, with no mention of version.
# doc/COPYING file specifies what is GPL and what is LGPL
# but no mention of versions in the source.
License: GPL+ and LGPLv2+
Group: System Environment/Base
URL: http://oss.sgi.com/projects/xfs/
Source0: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
Source1: xfsprogs-wrapper.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, libtool, gettext
BuildRequires: autoconf, libtool, gettext, gawk
BuildRequires: readline-devel
BuildRequires: /usr/include/uuid/uuid.h
Provides: xfs-cmds
Obsoletes: xfs-cmds <= %{version}
Conflicts: xfsdump < 2.0.0
Patch1: xfsprogs-2.8.20-fix-type-test.patch
Patch1: xfsprogs-2.9.4-misc-mkfs-fixes.patch
%description
A set of commands to use the XFS filesystem, including mkfs.xfs.
@ -46,9 +50,8 @@ also want to install xfsprogs.
%prep
%setup -q
# Fix autoconf u32 test for ppc64
%patch1 -p1 -b .type_test
#
%patch1 -p1
%build
# xfsprogs does not ship ./configure
autoconf
@ -111,6 +114,24 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so
%changelog
* Tue Oct 02 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-3
- mkfs.xfs: Fix wiping old AG headers and purge whack buffers
* Mon Oct 01 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-2
- Add alpha to the multilib wrapper (#310411)
* Mon Sep 10 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-1
- Update to xfsprogs 2.9.4
* Fri Aug 24 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-3
- Add gawk to buildrequires
* Thu Aug 16 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-2
- Update license tag
* Thu Jul 26 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-1
- Upgrade to xfsprogs 2.9.2, quota, xfs_repair, and filestreams changes
* Thu Jul 6 2007 Eric Sandeen <sandeen@redhat.com> 2.8.21-1
- Upgrade to xfsprogs 2.8.21, lazy sb counters enabled,
xfs_quota fix (#236746)