From 3648a874113d41dee4ecb59a903f3b450d550735 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 6 Apr 2016 15:43:23 +0200 Subject: reproducible debian: correctly show kernels used in variation table --- TODO | 1 - bin/reproducible_common.sh | 18 +++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index 37622518..ac0a01e2 100644 --- a/TODO +++ b/TODO @@ -182,7 +182,6 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma ** prebuilder does (user) group variation like this: https://anonscm.debian.org/cgit/reproducible/misc.git/tree/prebuilder/pbuilderhooks/A02_user ** variation of $TERM and $COLUMN (and maybe $LINES), unset in the first run, set to "linux" and "77" (and maybe "42") in the 2nd run. maybe vary $SHELL too. *** actually TERM is set to "linux" by default already, COLUMN is unset -** variation of users shell (bash + zsh|dash?) ==== reproducible Debian armhf diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 9f897591..086b7685 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -426,13 +426,17 @@ write_explaination_table() { fi if [ "$1" != "FreeBSD" ] ; then if [ "$1" = "debian" ] ; then - write_page "kernel versionone of:" - write_page " $(cat /srv/reproducible-results/node-information/* | grep KERNEL | grep amd64 | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
  ')" - 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 '
  ')" + write_page "kernel version" + for a in ${ARCHS} ; do + write_page "
on $a one of:" + write_page "$(cat /srv/reproducible-results/node-information/*$a* | grep KERNEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
  ')" + done write_page "" - write_page "(on amd64 systematically varied, on armhf not yet)
" - 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 '
  ')" - 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 '
  ')" + write_page "(on amd64 systematically varied, on i386 too (and also with 32 and 64 bit kernel variation) on armhf not yet)
" + for a in ${ARCHS} ; do + write_page "
on $a one of:" + write_page "$(cat /srv/reproducible-results/node-information/*$a* | grep KERNEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
  ')" + done write_page "" elif [ "$1" != "Arch Linux" ] ; then write_page "kernel version, modified using /usr/bin/linux64 --uname-2.6$(uname -sr)$(/usr/bin/linux64 --uname-2.6 uname -sr)" @@ -446,7 +450,7 @@ write_explaination_table() { fi FUTURE=$(date --date="${DATE}+398 days" +'%Y-%m-%d') if [ "$1" = "debian" ] ; then - write_page "CPU typeone of: $(cat /srv/reproducible-results/node-information/* | grep CPU_MODEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
  ')on amd64: same for both builds (currently, work in progress
on armhf: sometimes varied (depending on the build job)" + write_page "CPU typeone of: $(cat /srv/reproducible-results/node-information/* | grep CPU_MODEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '
  ')on amd64 and i386: same for both builds (currently, work in progress)
on armhf: sometimes varied (depending on the build job)" write_page "/bin/sh/bin/dash/bin/bash" write_page "year, month, datetoday ($DATE) or on amd64 also: $FUTUREon amd64: varied (398 days difference)
on armhf: same for both builds (currently, work in progress)" else -- cgit v1.2.3-54-g00ecf