summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-04-08 12:22:51 +0200
committerHolger Levsen <holger@layer-acht.org>2016-04-08 12:22:51 +0200
commitb9aae8b29ff1323189869c69229282366aef97b8 (patch)
tree79cd78736168e6a3ca4d19bda7de9e9b2a0b416d
parent7f2525f782a00c22bbedf31d9893041e793d1d40 (diff)
downloadjenkins.debian.net-b9aae8b29ff1323189869c69229282366aef97b8.tar.xz
reproducible debian: explain all variations for i386 too
-rwxr-xr-xbin/reproducible_common.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 9cb7310f..7201a399 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 />&nbsp;&nbsp;XXX for amd64: 18 or 17<br />&nbsp;&nbsp;XXX for armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY for amd64: 17 or 18 (!= the first build)<br />&nbsp;&nbsp;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 />&nbsp;&nbsp;XXX on amd64 and i386: 18 or 17<br />&nbsp;&nbsp;XXX on armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY on amd64 and i386: 17 or 18 (!= the first build)<br />&nbsp;&nbsp;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 />&nbsp;&nbsp;')"
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 />&nbsp;&nbsp;')"
@@ -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 />&nbsp;&nbsp;')</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>"