[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: fix pacman-git package from AUR fails to build

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 61a4dcaa3c109b64aa9f3cdbfefe9013ac238f87
Author: Eli Schwartz <eschwartz at archlinux.org>
Date:   Wed Jan 3 08:52:06 2018 -0500

    reproducible Arch Linux: fix pacman-git package from AUR fails to build
    
    The proper way to build AUR packages is to grab the tarballed snapshot,
    in order to ensure any additional files that come with the PKGBUILD are
    actually there.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_setup_archlinux_schroot.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 1966bcf..7018c8f 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -149,16 +149,13 @@ if [ "$HOSTNAME" = "profitbricks-build4-amd64" ] ; then
 	WGET_OPTS="--no-check-certificate"
 fi
 
-PKGBUILD_FILE="$(mktemp --tmpdir=$TEMPDIR archlinuxrb-PKGBUILD-XXXXXXXXXXXX)"
-wget $WGET_OPTS -O "$PKGBUILD_FILE" "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=pacman-git"
-# work around dependency weirdness: pacman-git is currently detected as 5.0.1, which is older than the released version
-echo 'provides=("pacman=5.0.2")' >> $PKGBUILD_FILE
+PACMAN_GIT_SNAPSHOT="$(mktemp --tmpdir=$TEMPDIR archlinuxrb-PACMAN-GIT-XXXXXXXXXXXX)"
+wget $WGET_OPTS -O "$PACMAN_GIT_SNAPSHOT" "https://aur.archlinux.org/cgit/aur.git/snapshot/pacman-git.tar.gz"
 
 $USERCMD bash <<-__END__
 set -e
-mkdir /pacman-git
+tar -xzvf "$PACMAN_GIT_SNAPSHOT" -C /
 cd /pacman-git
-mv $PKGBUILD_FILE ./PKGBUILD
 MAKEFLAGS="-j$NUM_CPU" makepkg
 __END__
 $ROOTCMD sh -c 'yes | pacman -U /pacman-git/pacman-*-x86_64.pkg.tar.xz'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git