From 648cdac59ad4ad5eddc02d9a490f0b08bfad113e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 21 Nov 2017 22:54:15 +0000 Subject: Revert "reproducible-archlinux: fix 2nd asp checkout" This reverts commit daf27ae691a8bb9c67dc4d61beee3151c6353860. --- bin/reproducible_build_archlinux_pkg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 6635d1c8..cbced05b 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -131,7 +131,7 @@ first_build() { schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux 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 $BUILDDIR - schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 asp checkout "$SRCPACKAGE" + schroot --run-session -c $SESSION --directory "$BUILDDIR" -- asp checkout "$SRCPACKAGE" # $SRCPACKAGE is actually the binary package ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR") # just set timezone in the 1st build @@ -184,7 +184,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 $BUILDDIR - schroot --run-session -c $SESSION --directory "$BUILDDIR" -- env GIT_SSL_NO_VERIFY=1 asp checkout "$SRCPACKAGE" + schroot --run-session -c $SESSION --directory "$BUILDDIR" -- asp checkout "$SRCPACKAGE" # $SRCPACKAGE is actually the binary package ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR") # add more variations in the 2nd build: TZ, LANG, LC_ALL, umask -- cgit v1.2.3-70-g09d2