[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: use linux64 --uname-2.6 correctly, thanks lunar

[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 186e4609f2e87687503b5ea79480ea8440d73d35
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Mar 19 17:33:04 2015 +0100

    reproducible: use linux64 --uname-2.6 correctly, thanks lunar
---
 bin/reproducible_build.sh                         | 2 +-
 etc/pbuilder/rebuild-hooks/D01_modify_environment | 2 --
 etc/sudoers.d/jenkins                             | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index c58414d..d76e52e 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -254,7 +254,7 @@ else
 			  TZ="/usr/share/zoneinfo/Etc/GMT-14" \
 			  LANG="fr_CH.UTF-8" \
 			  LC_ALL="fr_CH.UTF-8" \
-			  unshare --uts -- /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks \
+			  /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks \
 			    --debbuildopts "-b" --basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz --distribution ${SUITE} ${SRCPACKAGE}_${EVERSION}.dsc
 			) 2>&1 | tee -a ${RBUILDLOG}
 			set +x
diff --git a/etc/pbuilder/rebuild-hooks/D01_modify_environment b/etc/pbuilder/rebuild-hooks/D01_modify_environment
index db71ccf..57c785b 100755
--- a/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -9,5 +9,3 @@ echo "I: Changing hostname to test build reproducibility" >&2
 sed -e '/^127.0.0.1/s/$/ i-capture-the-hostname i-capture-the-hostname.i-capture-the-domain/' -i /etc/hosts
 hostname i-capture-the-hostname
 domainname i-capture-the-domain
-# let's pretend we're using a different kernel version
-linux64 --uname-2.6
diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins
index 34dbabf..103841a 100644
--- a/etc/sudoers.d/jenkins
+++ b/etc/sudoers.d/jenkins
@@ -30,7 +30,7 @@ jenkins ALL=  \
 	/bin/cp -rv /media/*, \
 	/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\
 	SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
-	SETENV: NOPASSWD: /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
+	SETENV: NOPASSWD: /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
 	/bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \
 	/bin/rm /var/cache/pbuilder/*base*.tgz, \
 	/bin/rm -v /var/cache/pbuilder/*base*.tgz, \

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