From 098be3a4d0c42d2cfa8f2dcc02fa1de28bd155f6 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 8 Feb 2016 20:08:16 +0100
Subject: reproducible debian: stop showing 'linux64 --uname-2.6 uname' in
 variation table

---
 bin/reproducible_common.sh | 10 +++++-----
 bin/reproducible_info.sh   |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index f71c77f4..a410c5ab 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -50,7 +50,7 @@ ARCHS="amd64 armhf"
 . /srv/jenkins/bin/jenkins_node_definitions.sh
 
 # variables on the nodes we are interested in
-BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL1 KERNEL2" # these also needs to be defined in bin/reproducible_info.sh
+BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL" # these also needs to be defined in bin/reproducible_info.sh
 
 # existing usertags in the Debian BTS
 USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment umask ftbfs locale"
@@ -416,12 +416,12 @@ write_explaination_table() {
 	if [ "$1" != "FreeBSD" ] ; then
 		if [ "$1" = "debian" ] ; then
 			write_page "<tr><td>kernel version</td></td><td>one of:"
-			write_page " $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | grep amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
-			write_page " $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | grep -v amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
+			write_page " $(cat /srv/reproducible-results/node-information/* | grep KERNEL | grep amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
+			write_page " $(cat /srv/reproducible-results/node-information/* | grep KERNEL | grep -v amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
 			write_page "</td>"
 			write_page "<td>(on amd64 systematically varied, on armhf not yet)<br />"
-			write_page "one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | grep amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
-			write_page "one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL1 | grep -v amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
+			write_page "one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL | grep amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
+			write_page "one of: $(cat /srv/reproducible-results/node-information/* | grep KERNEL | grep -v amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />&nbsp;&nbsp;')"
 			write_page "</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>"
diff --git a/bin/reproducible_info.sh b/bin/reproducible_info.sh
index 547cbcc5..aa52a25e 100755
--- a/bin/reproducible_info.sh
+++ b/bin/reproducible_info.sh
@@ -12,8 +12,7 @@ ARCH=$(dpkg --print-architecture)
 NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
 CPU_MODEL=$(cat /proc/cpuinfo |grep "model name"|head -1|cut -d ":" -f2|xargs echo)
 DATETIME=$(date +'%Y-%m-%d %H:%M %Z')
-KERNEL1=$(uname -smrv)
-KERNEL2=$(linux64 --uname-2.6 uname -smrv)
+KERNEL=$(linux64 --uname-2.6 uname -smrv)
 for i in $BUILD_ENV_VARS ; do
 	echo "$i=${!i}"
 done
-- 
cgit v1.2.3-54-g00ecf