summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2016-08-31 14:36:22 +0000
committerMattia Rizzolo <mattia@debian.org>2016-08-31 14:36:22 +0000
commitb98d3cba8f7726de25317deb05832c583c6000c8 (patch)
tree0cc44f5ce94ac1055ea21ac760c2df354a31b13e /bin
parentbe93cd56319d64a77d9b64712c11c5799f4ff395 (diff)
downloadjenkins.debian.net-b98d3cba8f7726de25317deb05832c583c6000c8.tar.xz
Revert "Vary the lengths of the two build paths"
It causes a too huge diff in the binaries, making diffoscope output unreadable. This reverts commit e5d053aefa5f6d5f54dc5ce4b33ce86ec4e26a0b.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh4
-rwxr-xr-xbin/reproducible_common.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 02b70b27..e7b56671 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -598,7 +598,7 @@ export LANGUAGE="en_US:en"
EOF
# build path is not yet varied on testing
if [ "${SUITE}" != "testing" ]; then
- echo "BUILDDIR=/build-first" >> "$TMPCFG"
+ echo "BUILDDIR=/build-1st" >> "$TMPCFG"
fi
# remember to change the sudoers setting if you change the following command
# FIXME: call with --buildinfo-identifier=dummy instead and below
@@ -657,7 +657,7 @@ umask 0002
EOF
# build path is not yet varied on testing
if [ "${SUITE}" != "testing" ]; then
- echo "BUILDDIR=/build-second" >> "$TMPCFG"
+ echo "BUILDDIR=/build-2nd" >> "$TMPCFG"
fi
set +e
# remember to change the sudoers setting if you change the following command
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 11f247a3..2cb89f46 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -410,7 +410,7 @@ write_variation_table() {
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>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
- write_page "<tr><td>build path</td><td>/build-first <em>(not varied for stretch)</em></td><td>/build-second <em>(not varied for stretch)</em></td></tr>"
+ write_page "<tr><td>build path</td><td>/build-1st <em>(not varied for stretch)</em></td><td>/build-2nd <em>(not varied for stretch)</em></td></tr>"
write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</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>"