Re: [PATCH 3/4] debian: Regenerate config.guess using debhelper

Steve Langasek
2021-02-21T07:18:03Z

On February 20, 2021 8:11:39 PM PST, Dave Chinner <david@fromorbit.com> wrote:
>On Sat, Feb 20, 2021 at 01:16:08PM +0100, Bastian Germann wrote:
>> This is a change introduced in 5.10.0-2ubuntu2 with the changelog:
>>
>> > xfsprogs upstream has regressed config.guess, so use
>> > dh_update_autotools_config.
>
>What regression?
>
>The xfsprogs build generates config.guess with the libtool
>infrastructure installed on the build machine. So I'm not sure
>how/what we've regressed here, because AFAIK we haven't changed
>anything here recently...

This upstream release ended up with an older version of config.guess in the tarball. Specifically, it was too old to recognize RISC-V as an architecture.

>> Reported-by: Steve Langasek <steve.langasek@ubuntu.com>
>> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
>> ---
>> debian/changelog | 3 +++
>> debian/rules | 1 +
>> 2 files changed, 4 insertions(+)
>>
>> diff --git a/debian/changelog b/debian/changelog
>> index c77f04ab..6cc9926b 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -4,6 +4,9 @@ xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
>> * Drop trying to create upstream distribution
>> * Enable CET on amd64
>>
>> + [ Steve Langasek ]
>> + * Regenerate config.guess using debhelper
>> +
>> -- Bastian Germann <bastiangermann@fishpost.de> Sat, 20 Feb 2021
>11:57:31 +0100
>>
>> xfsprogs (5.10.0-3) unstable; urgency=medium
>> diff --git a/debian/rules b/debian/rules
>> index dd093f2c..1913ccb6 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -49,6 +49,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
>
>Why would running at tool that does a search-n-replace of built
>config.guess files do anything when run before the build runs
>libtoolize to copy in the config.guess file it uses? I'm a bit
>confused by this...

Autoreconf was not copying in a newer version of config.guess from the system, because of the specific subset of autotools used by this project.

--
Steve Langasek