Commit a2a503b7 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Archlinux: introduce user/group variation 



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

bin/reproducible_build_archlinux_pkg.sh

+4 −1
Original line number Diff line number Diff line
@@ -401,6 +401,9 @@ second_build() { 
	export LC_ALL="fr_CH.UTF-8"

	umask 0002

	__END__

	# create group and user

	schroot --run-session -c $SESSION --directory "$BUILDDIR" -u root -- groupadd build2

	schroot --run-session -c $SESSION --directory "$BUILDDIR" -u root -- useradd -g build2 build2

	# some more output for debugging

	set -x

	# remove possible lock in our local session (happens when root maintenance update running while session starts)
@@ -416,7 +419,7 @@ second_build() { 
	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version

	# nicely run makepkg with a timeout of $TIMEOUT hours

	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \

		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1" | tee -a $LOG

		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -u root -- su -c "bash -l -c '$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1'" build2 | tee -a $LOG

	PRESULT=${PIPESTATUS[0]}

	if [ $PRESULT -eq 124 ] ; then

		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG

bin/reproducible_common.sh

+4 −0
Original line number Diff line number Diff line
@@ -486,6 +486,10 @@ write_variation_table() { 
		write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"

		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />&nbsp;&nbsp;XXX on amd64: 16 or 15<br />&nbsp;&nbsp;XXX on i386: 10 or 9<br />&nbsp;&nbsp;XXX on armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY on amd64: 16 or 15 (!= the first build)<br />&nbsp;&nbsp;YYY on i386: 10 or 9 (!= the first build)<br />&nbsp;&nbsp;YYY is the same as XXX on arm64<br />&nbsp;&nbsp;YYY on armhf: 8, 4, or 2 (not varied systematically)</td></tr>"

		write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"

	elif [ "$1" = "Arch Linux" ]  ; then

		write_page "<tr><td>env USER</td><td>jenkins</td><td>build 2</td></tr>"

		write_page "<tr><td>user/uid</td><td>jenkins/103</td><td>build2/1235</td></tr>"

		write_page "<tr><td>group/gid</td><td>jenkins/105</td><td>build2/1235</td></tr>"

	else

		write_page "<tr><td>env USER</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"

		write_page "<tr><td>uid</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"