Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
82b16f4a35 | ||
|
b9cae672b1 | ||
|
5d3b8f2ebb | ||
|
871fd038c0 | ||
|
587e15f197 | ||
|
873d778841 |
@ -1 +0,0 @@
|
||||
xfsprogs_2.9.4-1.tar.gz
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
xfsprogs_2.9.5-1.tar.gz
|
2
Makefile
2
Makefile
@ -4,7 +4,7 @@ NAME := xfsprogs
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
174683e3b86b587ed59823fdbbb96ea4 xfsprogs_2.9.4-1.tar.gz
|
||||
f32ab3282c3e02ce25128f7a6c2d5157 xfsprogs_2.9.8-1.tar.gz
|
||||
|
@ -1,50 +0,0 @@
|
||||
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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
#if defined(__i386__)
|
||||
#include "platform_defs-i386.h"
|
||||
#elif defined(__ia64__)
|
||||
#include "platform_defs-ia64.h"
|
||||
#elif defined(__x86_64__)
|
||||
#include "platform_defs-x86_64.h"
|
||||
#elif defined(__powerpc64__)
|
||||
#include "platform_defs-ppc64.h"
|
||||
#elif defined(__powerpc__)
|
||||
@ -15,10 +15,10 @@
|
||||
#include "platform_defs-s390x.h"
|
||||
#elif defined(__s390__)
|
||||
#include "platform_defs-s390.h"
|
||||
#elif defined(__x86_64__)
|
||||
#include "platform_defs-x86_64.h"
|
||||
#elif defined(__alpha__)
|
||||
#include "platform_defs-alpha.h"
|
||||
#elif defined(__sparc__) && defined(__arch64__)
|
||||
#include "platform_defs-sparc64.h"
|
||||
#elif defined(__sparc64__)
|
||||
#include "platform_defs-sparc.h"
|
||||
#else
|
||||
#error "This xfsprogs-devel package does not work your architecture?"
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
Summary: Utilities for managing the XFS filesystem
|
||||
Name: xfsprogs
|
||||
Version: 2.9.4
|
||||
Version: 2.9.8
|
||||
Release: 3%{?dist}
|
||||
# Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
|
||||
# in source, with no mention of version.
|
||||
@ -12,15 +12,12 @@ 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, gawk
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: libtool, gettext
|
||||
BuildRequires: /usr/include/uuid/uuid.h
|
||||
Provides: xfs-cmds
|
||||
Obsoletes: xfs-cmds <= %{version}
|
||||
Conflicts: xfsdump < 2.0.0
|
||||
|
||||
Patch1: xfsprogs-2.9.4-misc-mkfs-fixes.patch
|
||||
|
||||
%description
|
||||
A set of commands to use the XFS filesystem, including mkfs.xfs.
|
||||
|
||||
@ -50,28 +47,23 @@ also want to install xfsprogs.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
# xfsprogs does not ship ./configure
|
||||
autoconf
|
||||
#
|
||||
# xfsprogs abuses libexecdir
|
||||
export tagname=CC DEBUG=-DNDEBUG
|
||||
|
||||
%configure \
|
||||
--sbindir=/sbin \
|
||||
--libdir=/%{_lib} \
|
||||
--libexecdir=%{_libdir} \
|
||||
--bindir=%{_sbindir} \
|
||||
--enable-shared=yes \
|
||||
--enable-gettext=yes \
|
||||
--enable-shared-uuid=yes
|
||||
--bindir=%{_sbindir}
|
||||
|
||||
make %{?_smp_mflags}
|
||||
#
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make DIST_ROOT=$RPM_BUILD_ROOT install install-dev
|
||||
#
|
||||
|
||||
# nuke .la files, etc
|
||||
rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la}
|
||||
# fix up symlink to be correct
|
||||
@ -81,9 +73,13 @@ ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
|
||||
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
|
||||
|
||||
# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
|
||||
%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
|
||||
|
||||
%ifarch %{multilib_arches}
|
||||
mv -f $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h \
|
||||
$RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs-%{_arch}.h
|
||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h
|
||||
%endif
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -114,6 +110,34 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Wed Jun 04 2008 Dennis Gilmore <dennis@ausil.us> 2.9.8-3
|
||||
- sparc32 is built using the sparcv9 variant
|
||||
|
||||
* Wed Jun 04 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-2
|
||||
- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
|
||||
|
||||
* Wed Apr 23 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-1
|
||||
- Update to xfsprogs 2.9.8
|
||||
- Add support for sb_features2 in wrong location
|
||||
- Add -c option to xfs_admin to turn lazy-counters on/off
|
||||
- Added support for mdp in libdisk/mkfs.xfs
|
||||
|
||||
* Sun Mar 02 2008 Eric Sandeen <sandeen@redhat.com> 2.9.7-1
|
||||
- Update to xfsprogs 2.9.7
|
||||
- Lazy sb counters back off by default; other misc fixes
|
||||
|
||||
* Wed Feb 06 2008 Eric Sandeen <sandeen@redhat.com> 2.9.6-1
|
||||
- Update to xfsprogs 2.9.6 - fixes mkfs sizing problem.
|
||||
- Trim down BuildRequires to what's actually required now
|
||||
|
||||
* Mon Jan 21 2008 Eric Sandeen <sandeen@redhat.com> 2.9.5-1
|
||||
- Update to xfsprogs 2.9.5
|
||||
- Contains more optimal mkfs defaults
|
||||
- specfile cleanup, & don't restate config defaults
|
||||
|
||||
* Tue Oct 23 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-4
|
||||
- Add arm to multilib header wrapper
|
||||
|
||||
* Tue Oct 02 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-3
|
||||
- mkfs.xfs: Fix wiping old AG headers and purge whack buffers
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user