[Git][qa/jenkins.debian.net][master] reproducible Arch Linux: asp has been deprecated by pkgctl, thanks to dvzrv for the hints

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
a07e44fa by Holger Levsen at 2023-12-04T11:50:03+01:00
reproducible Arch Linux: asp has been deprecated by pkgctl, thanks to dvzrv for the hints

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_build_archlinux_pkg.sh
- bin/reproducible_setup_archlinux_schroot.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -140,7 +140,7 @@ first_build() {
 	schroot --run-session -c $SESSION --directory /tmp -u root -- ln -sfT dash /usr/bin/sh
 	echo "MAKEFLAGS=-j$NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/makepkg.conf
 	schroot --run-session -c $SESSION --directory /tmp -- mkdir -p $BUILDDIR
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 asp checkout "$SRCPACKAGE" 2>&1 | tee -a $LOG || echo "Error: failed to download PKGBUILD for $SRCPACKAGE from $REPOSITORY" | tee -a $LOG
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 pkgctl repo clone "$SRCPACKAGE" 2>&1 | tee -a $LOG || echo "Error: failed to download PKGBUILD for $SRCPACKAGE from $REPOSITORY" | tee -a $LOG
 	# $SRCPACKAGE is actually the binary package
 	ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR")
 	# modify timezone, LANG, LC_ALL in the 1st build.
@@ -228,7 +228,7 @@ second_build() {
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux
 	echo "MAKEFLAGS=-j$NEW_NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/makepkg.conf
 	schroot --run-session -c $SESSION --directory /tmp -- mkdir -p $BUILDDIR
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 asp checkout "$SRCPACKAGE" 2>&1 | tee -a $LOG || echo "Error: failed to download PKGBUILD for $SRCPACKAGE from $REPOSITORY" | tee -a $LOG
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 pkgctl repo clone "$SRCPACKAGE" 2>&1 | tee -a $LOG || echo "Error: failed to download PKGBUILD for $SRCPACKAGE from $REPOSITORY" | tee -a $LOG
 	# $SRCPACKAGE is actually the binary package
 	ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR")
 	# add more variations in the 2nd build: TZ (differently), LANG, LC_ALL, umask


=====================================
bin/reproducible_setup_archlinux_schroot.sh
=====================================
@@ -128,7 +128,7 @@ $ROOTCMD cat /etc/makepkg.conf
 echo "============================================================================="
 
 $ROOTCMD bash -l -c 'pacman -Syu --noconfirm'
-$ROOTCMD bash -l -c 'pacman -S --noconfirm --needed base-devel multilib-devel devtools fakechroot asciidoc asp expac dash'
+$ROOTCMD bash -l -c 'pacman -S --noconfirm --needed base-devel multilib-devel devtools fakechroot asciidoc expac dash'
 # configure sudo
 echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/a07e44fa69dc50f1730cedded36ce06cc8c46b63

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/a07e44fa69dc50f1730cedded36ce06cc8c46b63
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20231204/7792b4c5/attachment-0001.htm>