makerepropkg download used buid config

[jelly]

No description provided.

[jelly]

@anthraxx Be aware I force pushed your branch so the tests run.

[jelly]

For testing this PR:

Test building a new package with extra-x86_64-build records the build tool

cd /tmp/
archco filesystem
PATH=/home/jelle/projects/devtools/:$PATH extra-x86_64-build
tar xvf filesystem-2021.05.31-1-x86_64.pkg.tar.zst .BUILDINFO

Verify the buildtool was recorded:

[jelle@t14s][~/projects/devtools]%grep buildtool /tmp/filesystem/trunk/.BUILDINFO
buildtool = devtools
buildtoolver = 20210202-git

Now we want to reproduce this package, it should fail as the git version is unreleased:

[jelle@t14s][/tmp/filesystem/trunk]%/home/jelle/projects/devtools/makerepropkg filesystem-2021.05.31-1-x86_64.pkg.tar.zst
  -> retrieving 'devtools-20210202-git.pkg.tar.zst'...
curl: (22) The requested URL returned error: 404

  -> retrieving 'devtools-20210202-git.pkg.tar.xz'...
curl: (22) The requested URL returned error: 404

  -> retrieving 'devtools-20210202-git.pkg.tar'...
curl: (22) The requested URL returned error: 404

==> ERROR: failed to retrieve devtools-20210202-git

reproduce package with an old devtools version

Test reproducing a package with a different devtools version we previously released which contains changes which make the build output different. So we pick 20191212 which does not include zst compression yet.

cd /home/jelle/projects/devtools
make BUILDTOOLVER=20191212 -B

cd /tmp/
archco filesystem
PATH=/home/jelle/projects/devtools/:$PATH extra-x86_64-build

cd /tmp
wget https://archive.archlinux.org/packages/f/filesystem/filesystem-2019.10-2-x86_64.pkg.tar.xz
wget https://raw.githubusercontent.com/archlinux/svntogit-packages/8cb5773ffa42e06f5be0bcf46e7d86f07cce9f84/trunk/PKGBUILD

vim filesystem-2019.10-2-x86_64.pkg.tar.xz 

Edit the BUILDINFO and add:

buildtool = devtools
buildtoolver = 20191212

[jelle@t14s][/tmp]%/home/jelle/projects/devtools/makerepropkg filesystem-2019.10-2-x86_64.pkg.tar.xz
  -> retrieving 'devtools-20191212.pkg.tar.zst'...
curl: (22) The requested URL returned error: 404

  -> retrieving 'devtools-20191212.pkg.tar.xz'...
curl: (22) The requested URL returned error: 404

  -> retrieving 'devtools-20191212.pkg.tar'...
curl: (22) The requested URL returned error: 404

Even when setting pkgrel it does not work.

buildtoolver = 20191212-1

Setting the $arch works

buildtoolver = 20191212-1-any

Of course the rebuild fails due to GPG

[jelle@t14s][/tmp]%/home/jelle/projects/devtools/makerepropkg filesystem-2019.10-2-x86_64.pkg.tar.xz
  -> retrieving 'devtools-20191212-1-any.pkg.tar.zst'...
############################################################################################################################################ 100.0%curl: (22) The requested URL returned error: 404

  -> retrieving 'devtools-20191212-1-any.pkg.tar.xz'...
############################################################################################################################################ 100.0%
  -> retrieving 'devtools-20191212-1-any.pkg.tar.xz.sig'...
############################################################################################################################################ 100.0%
  -> using makepkg.conf from devtools-20191212-1-any
Create subvolume '/var/lib/archbuild/reproducible/root'
==> Creating install root at /var/lib/archbuild/reproducible/root
==> Installing packages to /var/lib/archbuild/reproducible/root
warning: database file for 'core' does not exist (use '-Sy' to download)
warning: database file for 'extra' does not exist (use '-Sy' to download)
warning: database file for 'community' does not exist (use '-Sy' to download)
loading packages...
error: '/var/cache/pacman/pkg/bash-5.0.011-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/binutils-2.33.1-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/bison-3.4.2-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/gcc-9.2.0-4-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/gcc-libs-9.2.0-4-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/glibc-2.30-2-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/gnupg-2.2.17-2-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/guile-2.2.6-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/iana-etc-20191030-1-any.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libassuan-2.5.3-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libatomic_ops-7.6.10-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libcap-2.27-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libnl-3.5.0-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libpcap-1.9.1-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libssh2-1.9.0-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libunistring-0.9.10-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/libusb-1.0.23-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/pinentry-1.1.0-4-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/readline-8.0.001-1-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)
error: '/var/cache/pacman/pkg/shadow-4.7-2-x86_64.pkg.tar.xz': invalid or corrupted package (PGP signature)

Issues

What about existing packages with a buildtool defined?!! These will all break:

• We can't edit the BUILDINFO, breaks the signature
• We could fallback to the an older devtools version (hardcode the old release) so it fetches the correct .BUILDINFO
• We don't check the BUILDINFO format in this patch (I think it was updated to 2 in the last pacman)

[jelly]

As I opened the PR I can't request changes or approve it, I think the PR just needs two small improvements and the new makerepropkg option should be documented in the man page.

Tested the changes locally and the fallback seems to work with a build package, setting a faulty version BUILDTOOLVER=20210202-4-any shows that the devtools package is trying to get fetched. So to me it looks good to go :)

[anthraxx]

merged via cli