Skip to contentSkip to conversation

Bug#725971: xfsprogs: config.guess/config.sub out of date for arm64

PATCH Colin Watson 4 participants 9 messages Oct 10, 2013 – Oct 18, 2013

lore
Share & tools
lore
#0 lore raw

Package: xfsprogs
Version: 3.1.9
Severity: important
Tags: patch
User: [email protected]
Usertags: arm64

xfsprogs' config.guess/config.sub are out of date for the forthcoming arm64 port. The attached patch sets things up so that you don't have to be bothered by this type of bug for future ports.

* Use the autotools-dev dh addon to update config.guess/config.sub for

    arm64.
debian/control +1 -1
diff -Nru xfsprogs-3.1.9/debian/control xfsprogs-3.1.9ubuntu1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: XFS Development Team <[email protected]>
 Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>
-Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev
+Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev, autotools-dev
 Standards-Version: 3.9.1
 Homepage: http://oss.sgi.com/projects/xfs/
 
debian/rules +3 -0
diff -Nru xfsprogs-3.1.9/debian/rules xfsprogs-3.1.9ubuntu1/debian/rules
@@ -35,6 +35,7 @@
 .census:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
+	dh_autotools-dev_updateconfig
 	$(options) $(MAKE) include/platform_defs.h
 	touch .census
 
@@ -57,6 +58,8 @@
 	$(MAKE) distclean
 	-rm -rf $(dirme) $(dirdev) $(dirdi)
 	-rm -f debian/*substvars debian/files* debian/*.debhelper
+	dh_autotools-dev_restoreconfig
+	dh_clean
 
 binary-indep:
 

Thanks,

Signature · 6 lines
Colin Watson                                       [[email protected]]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#1 lore raw

Hi all,

Have tested this out here & works just fine - please merge.

and tested-by, reviewed-by, etc ... whatever floats your boat.

thanks!

----- Forwarded Message -----
From: "Colin Watson" <[email protected]>
To: [email protected]
Sent: Friday, October 11, 2013 12:38:11 AM
Subject: Bug#725971: xfsprogs: config.guess/config.sub out of date for arm64

Package: xfsprogs
Version: 3.1.9
Severity: important
Tags: patch
User: [email protected]
Usertags: arm64

xfsprogs' config.guess/config.sub are out of date for the forthcoming arm64 port. The attached patch sets things up so that you don't have to be bothered by this type of bug for future ports.

* Use the autotools-dev dh addon to update config.guess/config.sub for

    arm64.
debian/control +1 -1
diff -Nru xfsprogs-3.1.9/debian/control xfsprogs-3.1.9ubuntu1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: XFS Development Team <[email protected]>
 Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>
-Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev
+Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev | libreadline5-dev, libblkid-dev (>= 2.17), linux-libc-dev, autotools-dev
 Standards-Version: 3.9.1
 Homepage: http://oss.sgi.com/projects/xfs/
 
debian/rules +3 -0
diff -Nru xfsprogs-3.1.9/debian/rules xfsprogs-3.1.9ubuntu1/debian/rules
@@ -35,6 +35,7 @@
 .census:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
+	dh_autotools-dev_updateconfig
 	$(options) $(MAKE) include/platform_defs.h
 	touch .census
 
@@ -57,6 +58,8 @@
 	$(MAKE) distclean
 	-rm -rf $(dirme) $(dirdev) $(dirdi)
 	-rm -f debian/*substvars debian/files* debian/*.debhelper
+	dh_autotools-dev_restoreconfig
+	dh_clean
 
 binary-indep:
 

Thanks,

Signature · 11 lines
Colin Watson                                       [[email protected]]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#2 lore raw

----- Original Message -----

Quoted 3 lines

...
Have tested this out here & works just fine - please merge.

Also, the attached fixes a warning in the deb build for me, plus some trivial cleanup in the release script.

cheers.

--
Nathan

debian/changelog +1 -1
index 125471d..0935e07 100644
@@ -2,7 +2,7 @@ xfsprogs (3.1.11) unstable; urgency=low
 
   * New upstream release
 
- -- Nathan Scott <[email protected]> Wed, 08 May 2013 12:59:56 -0500
+ -- Nathan Scott <[email protected]>  Wed, 08 May 2013 12:59:56 -0500
 
 xfsprogs (3.1.9) unstable; urgency=low
 
release.sh +2 -2
index db5cc74..e209574 100755
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 #
-# Automate generation a new release
+# Automate generation of a new release
 #
 
 . ./VERSION

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by
#3 lore raw

Please submit as a patch with a new subject next time ;)

commit 5b962abcbb952e5409e2b2a1ecbc71b5d370cdea

Author: Nathan Scott <[email protected]>
Date:   Thu Oct 10 23:56:19 2013 +0000

xfsprogs: fix a warning in the deb build

Fixes a warning in the deb build for me, plus some trivial cleanup in the release script.

Quoted 16 lines · Nathan Scott

----- Original Message -----

Quoted 3 lines

...
Have tested this out here & works just fine - please merge.

Also, the attached fixes a warning in the deb build for me, plus some trivial cleanup in the release script.

cheers.

--
Nathan

Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#6 lore raw
Quoted 3 lines · Christoph Hellwig

While updating it in the debhelp is nice for the Debian package I'd also really like to see a patch updating the files in the repository. Colin, would you mind sending that patch, too?

I looked, but there's nothing to send; the xfsprogs repository doesn't contain those files. They're updated by the configure target in Makefile, which is run as part of ./release.sh via "make dist". (Good; this should be as automatic as possible.)

IOW, any new upstream release will contain updated files as long as the developer who built the release has current libtool etc. installed. But of course this should be fixed to auto-update at build time in the Debian packaging anyway, since we want to be able to port to new architectures without having to upload lots of new source packages or take lots of new upstream releases at the same time; it makes life so much easier.

Cheers,

Signature · 6 lines
Colin Watson                                       [[email protected]]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#7 lore raw
Quoted 4 lines · Colin Watson

I looked, but there's nothing to send; the xfsprogs repository doesn't contain those files. They're updated by the configure target in Makefile, which is run as part of ./release.sh via "make dist". (Good; this should be as automatic as possible.)

Oh, forgot about that.

Quoted 7 lines

IOW, any new upstream release will contain updated files as long as the developer who built the release has current libtool etc. installed. But of course this should be fixed to auto-update at build time in the Debian packaging anyway, since we want to be able to port to new architectures without having to upload lots of new source packages or take lots of new upstream releases at the same time; it makes life so much easier.

As said, I don't disagree with your patch at all, I was just asking for an additional patch which turned out not to be nessecary.

Thanks a lot!

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs