Commit 42913dcd authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Arch Linux: use --protocol https 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 22ca4f99

bin/reproducible_build_archlinux_pkg.sh

+2 −2
Original line number Diff line number Diff line
@@ -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 pkgctl repo clone "$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 --protocol https "$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 pkgctl repo clone "$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 --protocol https "$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