summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorPaul Wise <pabs@debian.org>2016-08-31 15:25:48 +0800
committerMattia Rizzolo <mattia@debian.org>2016-08-31 13:37:15 +0000
commite5d053aefa5f6d5f54dc5ce4b33ce86ec4e26a0b (patch)
tree3de5004d274afc1d46984d9c3d45d67a25ed3cec /bin
parent9f08c4821063309e52af6c3bf7d1085730c1115e (diff)
downloadjenkins.debian.net-e5d053aefa5f6d5f54dc5ce4b33ce86ec4e26a0b.tar.xz
Vary the lengths of the two build paths
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
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 79997ad4..99a73a95 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -597,7 +597,7 @@ export LANGUAGE="en_US:en"
EOF
# build path is not yet varied on testing
if [ "${SUITE}" != "testing" ]; then
- echo "BUILDDIR=/build-1st" >> "$TMPCFG"
+ echo "BUILDDIR=/build-first" >> "$TMPCFG"
fi
# remember to change the sudoers setting if you change the following command
# FIXME: call with --buildinfo-identifier=dummy instead and below
@@ -655,7 +655,7 @@ umask 0002
EOF
# build path is not yet varied on testing
if [ "${SUITE}" != "testing" ]; then
- echo "BUILDDIR=/build-2nd" >> "$TMPCFG"
+ echo "BUILDDIR=/build-second" >> "$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 6c9c223e..2b668e2e 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-1st <em>(not varied for stretch)</em></td><td>/build-2nd <em>(not varied for stretch)</em></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>user's login shell</td><td>/bin/sh</td><td>/bin/bash</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>"