[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible debian: explain all variations for i386 too

[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 b9aae8b29ff1323189869c69229282366aef97b8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Apr 8 12:22:51 2016 +0200

    reproducible debian: explain all variations for i386 too
---
 bin/reproducible_common.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 9cb7310..7201a39 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -411,7 +411,7 @@ write_explaination_table() {
 		write_page "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>"
 		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
-		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX for amd64: 18 or 17<br />  XXX for armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY for amd64: 17 or 18 (!= the first build)<br />  YYY for armhf: 8, 4, or 2 (not varied systematically)</td></tr>"
+		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX on amd64 and i386: 18 or 17<br />  XXX on armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY on amd64 and i386: 17 or 18 (!= the first build)<br />  YYY on armhf: 8, 4, or 2 (not varied systematically)</td></tr>"
 		write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"
 	else
 		write_page "<tr><td>env USER</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
@@ -429,7 +429,7 @@ write_explaination_table() {
 				write_page "$(cat /srv/reproducible-results/node-information/*$a* | grep KERNEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />  ')"
 			done
 			write_page "</td>"
-			write_page "<td>(on amd64 systematically varied, on i386 too (and also with 32 and 64 bit kernel variation) on armhf not yet)<br />"
+			write_page "<td>(on amd64 systematically varied, on i386 too as well and also with 32 and 64 bit kernel variation, while on armhf not systematically)<br />"
 			for a in ${ARCHS} ; do
 				write_page "<br />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 '<br />  ')"
@@ -449,7 +449,7 @@ write_explaination_table() {
 	if [ "$1" = "debian" ] ; then
 		write_page "<tr><td>CPU type</td><td>one of: $(cat /srv/reproducible-results/node-information/* | grep CPU_MODEL | cut -d '=' -f2- | sort -u | tr '\n' '\0' | xargs -0 -n1 echo '<br />  ')</td><td>on amd64 and i386: same for both builds (currently, work in progress)<br />on armhf: sometimes varied (depending on the build job)</td></tr>"
 		write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
-		write_page "<tr><td>year, month, date</td><td>today ($DATE) or on amd64 also: $FUTURE</td><td>on amd64: varied (398 days difference)<br />on armhf: same for both builds (currently, work in progress)</td></tr>"
+		write_page "<tr><td>year, month, date</td><td>today ($DATE) or (on amd64 and i386 only) also: $FUTURE</td><td>on amd64 and i386: varied (398 days difference)<br />on armhf: same for both builds (currently, work in progress)</td></tr>"
 	else
 		write_page "<tr><td>CPU type</td><td>$(cat /proc/cpuinfo|grep 'model name'|head -1|cut -d ":" -f2-)</td><td>same for both builds</td></tr>"
 		write_page "<tr><td>/bin/sh</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"

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