Commit 83d7c78f authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Arch Linux: build in /tmp/archlinux-ci/$SRCPACKAGE... instead of /tmp/$SRCPACKAGE... 



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

bin/reproducible_build_archlinux_pkg.sh

+9 −9
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ cleanup_all() { 
		schroot --end-session -c archlinux-$SRCPACKAGE-$(basename $TMPDIR) > /dev/null 2>&1 || true

	fi

	# delete makepkg build dir

	if [ -n $SRCPACKAGE ] && [ -d /tmp/$SRCPACKAGE-$(basename $TMPDIR) ] ; then

		sudo rm -rf --one-file-system /tmp/$SRCPACKAGE-$(basename $TMPDIR)

	if [ -n $SRCPACKAGE ] && [ -d /tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR) ] ; then

		sudo rm -rf --one-file-system /tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR)

	fi

	# delete main work dir (only on master)

	if [ "$MODE" = "master" ] ; then
@@ -121,7 +121,7 @@ first_build() { 
	echo "Date:           $(date -u)"

	echo "============================================================================="

	local SESSION="archlinux-$SRCPACKAGE-$(basename $TMPDIR)"

	local BUILDDIR="/tmp/$SRCPACKAGE-$(basename $TMPDIR)"

	local BUILDDIR="/tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR)"

	local LOG=$TMPDIR/b1/$SRCPACKAGE/build1.log

	local FUTURE_STATE="disabled"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"
@@ -139,7 +139,7 @@ first_build() { 
	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux

	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 $BUILDDIR

	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

	# $SRCPACKAGE is actually the binary package

	ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR")
@@ -209,7 +209,7 @@ second_build() { 
	echo "Date:           $(date -u)"

	echo "============================================================================="

	local SESSION="archlinux-$SRCPACKAGE-$(basename $TMPDIR)"

	local BUILDDIR="/tmp/$SRCPACKAGE-$(basename $TMPDIR)"

	local BUILDDIR="/tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR)"

	local LOG=$TMPDIR/b2/$SRCPACKAGE/build2.log

	NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)

	local FUTURE_STATE="disabled"
@@ -227,7 +227,7 @@ second_build() { 
	echo "============================================================================="

	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 /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

	# $SRCPACKAGE is actually the binary package

	ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR")
@@ -364,9 +364,9 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then 
	fi



	# preserve results and delete build directory

	if [ -n "$(ls /tmp/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.zst)" ] ; then

	if [ -n "$(ls /tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.zst)" ] ; then

		# copying is enough here, we delete after this if block anyway

		cp --preserve=timestamps -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.zst $TMPDIR/b$MODE/$SRCPACKAGE/

		cp --preserve=timestamps -v /tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR)/*/trunk/*.pkg.tar.zst $TMPDIR/b$MODE/$SRCPACKAGE/

	else

		echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME didn't build a package!"

		# debug
@@ -374,7 +374,7 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then 
		ls -Rl

	fi



	sudo rm -rf --one-file-system /tmp/$SRCPACKAGE-$(basename $TMPDIR)

	sudo rm -rf --one-file-system /tmp/archlinux-ci/$SRCPACKAGE-$(basename $TMPDIR)

	echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME done."

	exit 0

fi