Skip to contentSkip to conversation

debian: Fix problems introduced with 5.10.0

PATCH In review Bastian Germann 2 participants 6 messages Feb 21, 2021 – Mar 7, 2021

lore
Share & tools
lore
#0 lore raw

v2 cover debian: Fix problems introduced with 5.10.0

There were two bugs introduced with the 5.6 -> 5.10 change in Debian:
RISC-V does not build. Fix that by regenerating it.
The new libinih package did not have a udeb package which is needed by xfsprogs-udeb. Explicitly depend on newer libinih versions.

Changelog:
v2: Drop Dimitri's Ubuntu changes (related to CET)

Bastian Germann (2):
debian: Regenerate config.guess using debhelper
debian: Build-depend on libinih-dev with udeb package

 debian/changelog | 10 ++++++++++
 debian/control   |  2 +-
 debian/rules     |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)
Signature · 1 line
2.30.1
#1 lore raw

PATCH v2 1/2 debian: Regenerate config.guess using debhelper

This is a change introduced in 5.10.0-2ubuntu2 with the changelog:

Quoted 2 lines

xfsprogs upstream has regressed config.guess, so use dh_update_autotools_config.

The 5.10.0 tarball has a config.guess that breaks builds on RISC-V:
...
UNAME_MACHINE = riscv64
UNAME_RELEASE = 5.0.0+
UNAME_SYSTEM = Linux
UNAME_VERSION = #2 SMP Sat Mar 9 22:34:53 UTC 2019
configure: error: cannot guess build type; you must specify one make[1]: *** [Makefile:131: include/builddefs] Error 1
...

---
 debian/changelog | 7 +++++++
 debian/rules     | 1 +
 2 files changed, 8 insertions(+)
debian/changelog +7 -0
index 5421aed6..679fbf03 100644
@@ -1,3 +1,10 @@
+xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
+
+  [ Steve Langasek ]
+  * Regenerate config.guess using debhelper
+
+ -- Bastian Germann <[email protected]>  Sat, 20 Feb 2021 11:57:31 +0100
+
 xfsprogs (5.10.0-3) unstable; urgency=medium
 
   * Drop unused dh-python from Build-Depends (Closes: #981361)
debian/rules +1 -0
index c6ca5491..fe9a1c3a 100755
@@ -43,6 +43,7 @@ config: .census
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
 	AUTOHEADER=/bin/true dh_autoreconf
+	dh_update_autotools_config
 	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
 	touch .census
 
Signature · 1 line
2.30.1
Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] debian: Regenerate config.guess using debhelper

Quoted 42 lines · Bastian Germann

This is a change introduced in 5.10.0-2ubuntu2 with the changelog:

Quoted 2 lines

xfsprogs upstream has regressed config.guess, so use dh_update_autotools_config.

The 5.10.0 tarball has a config.guess that breaks builds on RISC-V:
...
UNAME_MACHINE = riscv64
UNAME_RELEASE = 5.0.0+
UNAME_SYSTEM = Linux
UNAME_VERSION = #2 SMP Sat Mar 9 22:34:53 UTC 2019
configure: error: cannot guess build type; you must specify one make[1]: *** [Makefile:131: include/builddefs] Error 1
...

---
 debian/changelog | 7 +++++++
 debian/rules     | 1 +
 2 files changed, 8 insertions(+)
debian/changelog +7 -0
index 5421aed6..679fbf03 100644
@@ -1,3 +1,10 @@
+xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
+
+  [ Steve Langasek ]
+  * Regenerate config.guess using debhelper
+
+ -- Bastian Germann <[email protected]>  Sat, 20 Feb 2021 11:57:31 +0100
+
 xfsprogs (5.10.0-3) unstable; urgency=medium
 
   * Drop unused dh-python from Build-Depends (Closes: #981361)
debian/rules +0 -0
index c6ca5491..fe9a1c3a 100755

debian/rules config: .census · line 46

Quoted 4 lines
debian/rules +1 -0
@@ -43,6 +43,7 @@ config: .census
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
 	AUTOHEADER=/bin/true dh_autoreconf
+	dh_update_autotools_config

Hm. The manual page says "dh_update_autotools_config replaces all occurrences of config.sub and config.guess in the source tree by the up-to-date versions found in the autotools-dev package."

autoreconf does not itself examine config.{guess,sub}. automake can override those files if someone passes it --force --add-missing, but nobody does. The build then kicks off with an ancient config.guess.

Hence this patch forcibly overrides config.guess (and config.sub) after autoreconf, but before debuild gets to ./configure, thereby solving the build failure on riscv.

Eric could also not to ship config.guess files at all, but that would break the age-old "download and unpack tarball, ./configure && make" workflow. Overriding the files also works, though I have not focused on repercussions for reproducible builds while examining this patch.

----------

As for the question of why the config.guess file versions keep changing in the .orig and kernel.org tarballs--

[1] is a tarball with a 2013 era config.guess and files owned by 'sandeen', which I guess means that Eric generates the config.guess file on a machine with fairly old devel packages before uploading to kernel.org.

[2] is a tarball with a 2016 era config.guess and files owned by 'nathans'. I suspect this means that Nathan Scott generated his own .orig tarball when creating the 5.6.0 package, and as part of that generated config.guess from a (somewhat more up to date) system?

[3] is a tarball with a 2013 era config.guess and files owned by 'sandeen', which I guess means that four releases later, Eric still generates the config.guess file on a machine with fairly old devel packages before uploading to kernel.org. Though weirdly now he's doing this as root (or I really hope fakeroot?)

[4] appears to be the same tarball as [3].

So reading between the lines here, I speculate that Eric runs 'make xfsprogs-5.6.0.tar.xz' on (who are we kidding here, RHEL) and so that tarball gets the 2013 era config.guess. Nathan ran 'make xfsprogs-5.6.0.tar.gz' on Debian and uploaded that to Debian, whereas Bastian is pulling tarballs straight from kernel.org? Then Ubuntu pulled the Debian sources, found that riscv regressed, hence this patch to reset config.guess?

(And the reason I never noticed is that I build from git on Ubuntu 20.04. There's no config.guess in the build directory so the build scripts install config.guess from autotools-dev; the one I get is from 2018 or so...)

Insofar as I avoid have strong opinions about packaging, I don't think it's unreasonable for a distro to override autotools files with the versions that they're shipping in that distro. Who knows what kinds of adjustments Debian makes to autotools, and it's certainly their right to do that.

<flame>
Personally I also think the upstream tarball should not ship with any of those autotools files at all because they are not revision-controlled in upstream git. Anyone building from source ought to have autotools and can generate their own.
</flame>

--D

[1] https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.6.0.tar.gz
[2] http://archive.ubuntu.com/ubuntu/pool/main/x/xfsprogs/xfsprogs_5.6.0.orig.tar.gz

[3] https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.10.0.tar.xz
[4] http://deb.debian.org/debian/pool/main/x/xfsprogs/xfsprogs_5.10.0.orig.tar.xz

Quoted 6 lines
debian/rules +0 -0
 	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
 	touch .census
 
Signature · 1 line
2.30.1
#3 lore raw

PATCH v2 2/2 debian: Build-depend on libinih-dev with udeb package

In reply to Bastian Germann

The first libinih Debian package version with udeb binary package is 53-1. Debian bug #981662 documents the need for it:
xfsprogs-udeb depends on libinih1, not libinih1-udeb

---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
debian/changelog +3 -0
index 679fbf03..8738ab90 100644
@@ -3,6 +3,9 @@ xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
   [ Steve Langasek ]
   * Regenerate config.guess using debhelper
 
+  [ Bastian Germann ]
+  * Build-depend on libinih-dev with udeb package
+
  -- Bastian Germann <[email protected]>  Sat, 20 Feb 2021 11:57:31 +0100
 
 xfsprogs (5.10.0-3) unstable; urgency=medium
debian/control +1 -1
index 1da8093d..e4ec897c 100644
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: XFS Development Team <[email protected]>
 Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>, Bastian Germann <[email protected]>
-Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config
+Build-Depends: libinih-dev (>= 53), uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config
 Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
 
Signature · 1 line
2.30.1
Reviewed-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] debian: Build-depend on libinih-dev with udeb package

Quoted 6 lines · Bastian Germann

The first libinih Debian package version with udeb binary package is 53-1. Debian bug #981662 documents the need for it:
xfsprogs-udeb depends on libinih1, not libinih1-udeb

Oops, yeah... :(

--D

Quoted 35 lines
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
debian/changelog +3 -0
index 679fbf03..8738ab90 100644
@@ -3,6 +3,9 @@ xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
   [ Steve Langasek ]
   * Regenerate config.guess using debhelper
 
+  [ Bastian Germann ]
+  * Build-depend on libinih-dev with udeb package
+
  -- Bastian Germann <[email protected]>  Sat, 20 Feb 2021 11:57:31 +0100
 
 xfsprogs (5.10.0-3) unstable; urgency=medium
debian/control +1 -1
index 1da8093d..e4ec897c 100644
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: XFS Development Team <[email protected]>
 Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>, Bastian Germann <[email protected]>
-Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config
+Build-Depends: libinih-dev (>= 53), uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config
 Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
 
Signature · 1 line
2.30.1
#5 lore raw
In reply to Bastian Germann

Am 21.02.21 um 10:39 schrieb Bastian Germann:

Quoted 8 lines

There were two bugs introduced with the 5.6 -> 5.10 change in Debian:
RISC-V does not build. Fix that by regenerating it.
The new libinih package did not have a udeb package which is needed by xfsprogs-udeb. Explicitly depend on newer libinih versions.

Changelog:
v2: Drop Dimitri's Ubuntu changes (related to CET)

Quoted 8 lines

Bastian Germann (2):
debian: Regenerate config.guess using debhelper
debian: Build-depend on libinih-dev with udeb package

  debian/changelog | 10 ++++++++++
  debian/control   |  2 +-
  debian/rules     |  1 +
  3 files changed, 12 insertions(+), 1 deletion(-)

Any chance of getting this reviewed series in the tree?