Review: xfsprogs with libblkid enabled for Debian

Review: xfsprogs with libblkid enabled for Debian

[nathans]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

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.

-- 
Nathan

[-- Attachment #2: patchlet --]
[-- Type: text/x-patch, Size: 5340 bytes --]

diff --git a/Makefile b/Makefile
index 9d98bb0..c40fb2c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/VERSION b/VERSION
index 40f0361..58a77e2 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=3
 PKG_MINOR=1
-PKG_REVISION=2
+PKG_REVISION=3
 PKG_BUILD=1
diff --git a/debian/changelog b/debian/changelog
index c1f3257..502c8e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfsprogs (3.1.3) unstable; urgency=low
+
+  * New upstream release
+  * Enforce building with libblkid (closes: #593320)
+
+ -- Nathan Scott <nathans@debian.org>  Wed, 18 Aug 2010 13:34:59 +1000
+
 xfsprogs (3.1.2) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 5130bab..0f437b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>
-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
diff --git a/debian/rules b/debian/rules
index 8c15dcb..a26195d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/doc/CHANGES b/doc/CHANGES
index 9a3b998..c433a50 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -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.
diff --git a/libdisk/Makefile b/libdisk/Makefile
index f56f3b4..b058a9f 100644
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -20,7 +20,11 @@ else
 LSRCFILES = $(LINUX_DRIVERS)
 endif
 
+ifneq ($(ENABLE_BLKID), yes)
 default: ltdepend $(LTLIBRARY)
+else
+default:
+endif
 
 include $(BUILDRULES)
 
diff --git a/man/man8/xfs_mdrestore.8 b/man/man8/xfs_mdrestore.8
index 0aadc4a..a7d2b68 100644
--- a/man/man8/xfs_mdrestore.8
+++ b/man/man8/xfs_mdrestore.8
@@ -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 xfs@oss.sgi.com .
\ No newline at end of file
+.BR xfs@oss.sgi.com .
diff --git a/man/man8/xfs_metadump.8 b/man/man8/xfs_metadump.8
index f0ff1ae..9672713 100644
--- a/man/man8/xfs_metadump.8
+++ b/man/man8/xfs_metadump.8
@@ -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.

[-- Attachment #3: Type: text/plain, Size: 121 bytes --]

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: Review: xfsprogs with libblkid enabled for Debian

[Dave Chinner]

On Wed, Aug 18, 2010 at 03:06:28PM +1000, nathans@aconex.com 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.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: Review: xfsprogs with libblkid enabled for Debian

[Christoph Hellwig]

On Wed, Aug 18, 2010 at 03:06:28PM +1000, nathans@aconex.com 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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: Review: xfsprogs with libblkid enabled for Debian

[Nathan Scott]

----- "Christoph Hellwig" <hch@infradead.org> wrote:

> On Wed, Aug 18, 2010 at 03:06:28PM +1000, nathans@aconex.com 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.
> 

Yep, will do.

> 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.

> 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.

Oh, OK - hmm, will go through the git logs again & see what I can find.

> 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?

Sure, will wait for that before I commit anything.

> Next week also has Alex back from vacation, so I'd suggest waiting if
> he has any input on this.

No worries.

cheers.

-- 
Nathan

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: Review: xfsprogs with libblkid enabled for Debian

[Nathan Scott]

----- "Christoph Hellwig" <hch@infradead.org> wrote:

> 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.

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.

-- 
Nathan

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: Review: xfsprogs with libblkid enabled for Debian

[Alex Elder]

On Thu, 2010-08-26 at 23:26 +1000, Nathan Scott wrote:
> ----- "Christoph Hellwig" <hch@infradead.org> wrote:
> 
> > 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.
> 
> 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.

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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: Review: xfsprogs with libblkid enabled for Debian

[Nathan Scott]

----- "Alex Elder" <aelder@sgi.com> wrote:

> > > 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.
> 
> Sorry I didn't get this done for you last week.  I hadn't looked

Not a problem.

> 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.

-- 
Nathan

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs