From a84a80c8132baff5bf048259dd821fc6782b04c8 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 3 Dec 2015 12:18:26 +0200
Subject: reproducible: don't modify the kernel version with linux64 (for now),
 as this is broken in sid atm (bug about to be filed)

---
 bin/reproducible_build.sh  | 1 -
 bin/reproducible_common.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 19f7a656..238b95c3 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -596,7 +596,6 @@ EOF
 	set +e
 	# remember to change the sudoers setting if you change the following command
 	sudo timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice \
-		/usr/bin/linux64 --uname-2.6 \
 		/usr/bin/unshare --uts -- \
 		/usr/sbin/pbuilder --build \
 			--configfile $TMPCFG \
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 27daaeae..467a2f40 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -374,7 +374,7 @@ write_explaination_table() {
 	fi
 	if [ "$1" != "FreeBSD" ] ; then
 		if [ "$1" = "debian" ] ; then
-			write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td></td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL2 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')</td></tr>"
+			write_page "<tr><td>kernel version, <em>currently not</em> modified using /usr/bin/linux64 --uname-2.6</td></td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL2 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')</td></tr>"
 		elif [ "$1" != "Arch Linux" ]  ; then
 			write_page "<tr><td>kernel version, modified using /usr/bin/linux64 --uname-2.6</td><td>$(uname -sr)</td><td>$(/usr/bin/linux64 --uname-2.6 uname -sr)</td></tr>"
 		else
-- 
cgit v1.2.3-70-g09d2