[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible FreeBSD: allow SOURCE_DATE_EPOCH through sudo

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 9f6f57ab0991db13e49c2b2f978a719b2804ee67
Author: Ed Maste <emaste at freebsd.org>
Date:   Wed Feb 22 09:46:34 2017 -0500

    reproducible FreeBSD: allow SOURCE_DATE_EPOCH through sudo
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_freebsd.sh                 | 4 ++--
 hosts/freebsd-jenkins/usr/local/etc/sudoers | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index e2a5362..c37055a 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -128,7 +128,7 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do
 	# actually build everything
 	if ( $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo make -j $NUM_CPU WITH_REPRODUCIBLE_BUILD=yes buildworld" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo make -j $NUM_CPU WITH_REPRODUCIBLE_BUILD=yes buildkernel" && \
-	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo SOURCE_DATE_EPOCH=$START make -j $NUM_CPU PKG_VERSION=current packages" && \
+	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG SOURCE_DATE_EPOCH=$START sudo make -j $NUM_CPU PKG_VERSION=current packages" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU installworld" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU installkernel" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU distribution" ) ; then
@@ -159,7 +159,7 @@ for FREEBSD_TARGET in ${FREEBSD_TARGETS} ;do
 	# actually build everything
 	if ( $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL sudo make -j $NEW_NUM_CPU WITH_REPRODUCIBLE_BUILD=yes buildworld" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL sudo make -j $NEW_NUM_CPU WITH_REPRODUCIBLE_BUILD=yes buildkernel" && \
-	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL sudo SOURCE_DATE_EPOCH=$START make -j $NEW_NUM_CPU PKG_VERSION=current packages" && \
+	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL SOURCE_DATE_EPOCH=$START sudo make -j $NEW_NUM_CPU PKG_VERSION=current packages" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL DESTDIR=$TMPDIR sudo make -j $NEW_NUM_CPU installworld" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL DESTDIR=$TMPDIR sudo make -j $NEW_NUM_CPU installkernel" && \
 	  $RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG LC_ALL=$LC_ALL DESTDIR=$TMPDIR sudo make -j $NEW_NUM_CPU distribution" ) ; then
diff --git a/hosts/freebsd-jenkins/usr/local/etc/sudoers b/hosts/freebsd-jenkins/usr/local/etc/sudoers
index a0bd35e..35f9c9f 100644
--- a/hosts/freebsd-jenkins/usr/local/etc/sudoers
+++ b/hosts/freebsd-jenkins/usr/local/etc/sudoers
@@ -47,6 +47,8 @@ Defaults     env_keep += "PKG_PATH PKG_DBDIR PKG_TMPDIR TMPDIR PACKAGEROOT PACKA
 Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET"
 # for reproducible builds:
 Defaults env_keep += "TZ DESTDIR"
+# for pkg base timestamps, until connected to the FreeBSD release build scripts:
+Defaults env_keep += "SOURCE_DATE_EPOCH"
 ##
 ## Run X applications through sudo; HOME is used to find the
 ## .Xauthority file.  Note that other programs use HOME to find   

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git