Commit 8d2d1b29 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Archlinux: set PATH to... 


reproducible Archlinux: set PATH to /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' because that's what makechrootpkg is using

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

bin/reproducible_build_archlinux_pkg.sh

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ first_build() { 
	local BUILDDIR="/tmp/$SRCPACKAGE-$(basename $TMPDIR)"

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

	local FUTURE_STATE="disabled"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH'"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"

	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"

	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then

		FUTURE_STATE="enabled"
@@ -203,7 +203,7 @@ second_build() { 
	local LOG=$TMPDIR/b2/$SRCPACKAGE/build2.log

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

	local FUTURE_STATE="disabled"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH'"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"

	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"

	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then

		FUTURE_STATE="enabled"

bin/reproducible_common.sh

+2 −0
Original line number Diff line number Diff line
@@ -460,6 +460,8 @@ write_variation_table() { 
	fi

	if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ]  ; then

		write_page "<tr><td>env PATH</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:\"</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path\"</td></tr>"

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

		write_page "<tr><td>env PATH</td><td colspan=\"2\">is set to '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' because that's what <i>makechrootpkg</i> is using</td>"

	else

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

	fi