Review: xfsprogs with libblkid enabled for Debian
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi guys,
Attached patch adds support for libblkid in Debian builds. There's a couple of other trivial things fixed up while the package was building - man page typos reported by lintian, fix source tarball generation (and deb build) when libblkid is enabled (*must* descend into libdisk to pick up sources) ... but its all pretty straight forward.
I've checked that mkfs.xfs is linked as expected too. :)
cheers.
Signature · 1 line
Nathan
Makefile +1 -5
@@ -39,14 +39,10 @@ LDIRDIRT = $(SRCDIR) LDIRT += $(SRCTAR) endif -LIB_SUBDIRS = libxfs libxlog libxcmd libhandle $(LDISK) +LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \ mdrestore repair rtcp m4 man doc po debian -ifneq ($(ENABLE_BLKID), yes) -LIB_SUBDIRS += libdisk -endif - SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS) default: include/builddefs include/platform_defs.h
VERSION +1 -1
@@ -3,5 +3,5 @@ # PKG_MAJOR=3 PKG_MINOR=1 -PKG_REVISION=2 +PKG_REVISION=3 PKG_BUILD=1
debian/changelog +7 -0
@@ -1,3 +1,10 @@ +xfsprogs (3.1.3) unstable; urgency=low + + * New upstream release + * Enforce building with libblkid (closes: #593320) + + -- Nathan Scott <[email protected]> Wed, 18 Aug 2010 13:34:59 +1000 + xfsprogs (3.1.2) unstable; urgency=low * New upstream release
debian/control +5 -5
@@ -3,15 +3,15 @@ Section: admin Priority: optional Maintainer: Nathan Scott <[email protected]> Uploaders: Anibal Monsalve Salazar <[email protected]> -Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline5-dev -Standards-Version: 3.8.1 +Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline5-dev, libblkid-dev +Standards-Version: 3.9.1 Homepage: http://oss.sgi.com/projects/xfs/ Package: xfsprogs Depends: ${shlibs:Depends}, ${misc:Depends} Provides: fsck-backend Suggests: xfsdump, acl, attr, quota -Conflicts: xfsdump (<< 3.0.0) +Breaks: xfsdump (<< 3.0.0) Architecture: any Description: Utilities for managing the XFS filesystem A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -29,8 +29,8 @@ Description: Utilities for managing the XFS filesystem Package: xfslibs-dev Section: libdevel Priority: extra -Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0) -Conflicts: xfsprogs (<< 3.0.0) +Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends} +Breaks: xfsprogs (<< 3.0.0) Architecture: any Description: XFS filesystem-specific static libraries and headers xfslibs-dev contains the libraries and header files needed to
debian/rules +1 -1
@@ -20,7 +20,7 @@ stdenv = @GZIP=-q; export GZIP; options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ INSTALL_USER=root INSTALL_GROUP=root \ - LOCAL_CONFIGURE_OPTIONS=--enable-readline=yes ; + LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes --enable-blkid=yes" ; diopts = $(options) \ export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no" ; checkdir = test -f debian/rules
doc/CHANGES +9 -0
@@ -1,3 +1,12 @@ +xfsprogs-3.1.3 (18 August 2010) + - Fix depend targets. + - Allow xfs_io resvsp command for foreign filesystems. + - Fix configure --prefix. + - Make xfs_db check for valid inode data pointer before dereferencing. + - Unbreak make update-po, permissions problem. + - Fix linking of libxfs. Fix librt detection (needs pthread). + - Add a platform_discard_blocks stub for GNU/kFreebsd. + xfsprogs-3.1.2 (6 May 2010) - Fix missing thread synchronization in xfs_repair duplicate extent tracking.
libdisk/Makefile +4 -0
@@ -20,7 +20,11 @@ else LSRCFILES = $(LINUX_DRIVERS) endif +ifneq ($(ENABLE_BLKID), yes) default: ltdepend $(LTLIBRARY) +else +default: +endif include $(BUILDRULES)
man/man8/xfs_mdrestore.8 +2 -2
@@ -38,7 +38,7 @@ can be destroyed. Shows restore progress on stdout. .SH DIAGNOSTICS .B xfs_mdrestore -returns an exit code of 0 if all the metadata is succesfully restored or +returns an exit code of 0 if all the metadata is successfully restored or 1 if an error occurs. .SH SEE ALSO .BR xfs_metadump (8),
@@ -47,4 +47,4 @@ returns an exit code of 0 if all the metadata is succesfully restored or .BR xfs (5) .SH BUGS Email bug reports to -.BR [email protected] . +.BR [email protected] .
man/man8/xfs_metadump.8 +2 -2
@@ -98,11 +98,11 @@ copied. Disables obfuscation of file names and extended attributes. .TP .B \-w -Prints warnings of inconsistant metadata encountered to stderr. Bad metadata +Prints warnings of inconsistent metadata encountered to stderr. Bad metadata is still copied. .SH DIAGNOSTICS .B xfs_metadump -returns an exit code of 0 if all readable metadata is succesfully copied or +returns an exit code of 0 if all readable metadata is successfully copied or 1 if a write error occurs or a read error occurs and the .B \-e option used.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Dave Chinner
Reviewed-byQuoted 10 lines · On Wed, Aug 18, 2010 at 03:06:28PM +1000, [email protected] wrote:
Hi guys,
Attached patch adds support for libblkid in Debian builds. There's a couple of other trivial things fixed up while the package was building - man page typos reported by lintian, fix source tarball generation (and deb build) when libblkid is enabled (*must* descend into libdisk to pick up sources) ... but its all pretty straight forward.
I've checked that mkfs.xfs is linked as expected too. :)
Looks OK to me.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 10 lines · On Wed, Aug 18, 2010 at 03:06:28PM +1000, [email protected] wrote:
Hi guys,
Attached patch adds support for libblkid in Debian builds. There's a couple of other trivial things fixed up while the package was building - man page typos reported by lintian, fix source tarball generation (and deb build) when libblkid is enabled (*must* descend into libdisk to pick up sources) ... but its all pretty straight forward.
I've checked that mkfs.xfs is linked as expected too. :)
All the changes in here look good, but I'd be much happier if you'd submit separate changes with separate changelogs for the manpage updates and the libdisk packaging fix.
As for the blkid-dev build-dep: we need at least version 2.17 of it as that introduced the symbols we need, I think a versioned dependency for this would be in order.
The doc/CHANGES update should include the names of external contributors where applicable, and currently the release date for is set as part of the release.sh process.
I'm fine with pushing out a new 3.1.3 release as it's time anyway, but can we also include Dave's patch to add XFS_IOC_ZERO_RANGE support to xfs_io and the xfsctl manpage first?
Next week also has Alex back from vacation, so I'd suggest waiting if he has any input on this.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 10 lines · ----- "Christoph Hellwig
Quoted 9 lines · On Wed, Aug 18, 2010 at 03:06:28PM +1000, [email protected] wrote:
Hi guys,
Attached patch adds support for libblkid in Debian builds. There's a couple of other trivial things fixed up while the package was building - man page typos reported by lintian, fix source tarball generation (and deb build) when libblkid is enabled (*must* descend into libdisk to pick up sources) ... but its all pretty straight forward.
Quoted 6 lines
Quoted 1 line
I've checked that mkfs.xfs is linked as expected too. :)
All the changes in here look good, but I'd be much happier if you'd submit separate changes with separate changelogs for the manpage updates and the libdisk packaging fix.
Yep, will do.
Quoted 3 lines
As for the blkid-dev build-dep: we need at least version 2.17 of it as that introduced the symbols we need, I think a versioned dependency for this would be in order.
Good point, will do.
Quoted 4 lines
The doc/CHANGES update should include the names of external contributors
where applicable, and currently the release date for is set as part of therelease.shprocess.
Oh, OK - hmm, will go through the git logs again & see what I can find.
Quoted 4 lines
I'm fine with pushing out a new 3.1.3 release as it's time anyway, but
can we also include Dave's patch to addXFS_IOC_ZERO_RANGEsupport toxfs_ioand the xfsctl manpage first?
Sure, will wait for that before I commit anything.
Quoted 2 lines
Next week also has Alex back from vacation, so I'd suggest waiting if he has any input on this.
No worries.
cheers.
Signature · 6 lines
Nathan _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 7 lines · ----- "Christoph Hellwig
I'm fine with pushing out a new 3.1.3 release as it's time anyway, but
can we also include Dave's patch to addXFS_IOC_ZERO_RANGEsupport toxfs_ioand the xfsctl manpage first?Next week also has Alex back from vacation, so I'd suggest waiting if he has any input on this.
As discussed on IRC, I made the changes and push out a new release.sh tagged git update to kernel.org. I pushed the src tarball to oss also, and libblkid enabled packages will be uploaded to Debian shortly.
cheers.
Signature · 6 lines
Nathan _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 7 lines · Nathan Scott
Quoted 5 lines · ----- "Christoph Hellwig
I'm fine with pushing out a new 3.1.3 release as it's time anyway, but
can we also include Dave's patch to addXFS_IOC_ZERO_RANGEsupport toxfs_ioand the xfsctl manpage first?
Quoted 6 lines
Quoted 2 lines
Next week also has Alex back from vacation, so I'd suggest waiting if he has any input on this.
As discussed on IRC, I made the changes and push out a new
release.shtagged git update to kernel.org. I pushed the src tarball to oss also, and libblkid enabled packages will be uploaded to Debian shortly.
Sorry I didn't get this done for you last week. I hadn't looked over the patch closely yet and didn't notice you were proposing a new release.
Now that I've looked, I can say the changes all look fine to me. I'm glad you broke up your recent patch into multiple commits.
I will publish your versioned release on oss.sgi.com today after my tests complete.
-Alex
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 8 lines · ----- "Alex Elder
Quoted 6 lines
Quoted 2 lines
Next week also has Alex back from vacation, so I'd suggest waiting if he has any input on this.
As discussed on IRC, I made the changes and push out a new
release.shtagged git update to kernel.org. I pushed the src tarball to oss also, and libblkid enabled packages will be uploaded to Debian shortly.Sorry I didn't get this done for you last week. I hadn't looked
Not a problem.
Quoted 8 lines
over the patch closely yet and didn't notice you were proposing a new release.
Now that I've looked, I can say the changes all look fine to me. I'm glad you broke up your recent patch into multiple commits.
I will publish your versioned release on oss.sgi.com today after my tests complete.
Great, thanks. You'll find there is a src tarball on oss already, in what looked like the usual spot that you put 'em. If, while testing, you come across something else that needs to change, pls bump version again before releasing - thanks!
cheers.
Signature · 6 lines
Nathan _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs