summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReiner Herrmann <reiner@reiner-h.de>2016-07-31 20:02:27 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-01 14:02:30 -0400
commit862643b7e777d87fd59a6cae0093f468f3cc4bee (patch)
tree632bcb7b46c8ac4168abc70b583b931d8e516a9d
parent87c8dd5b8537a5385f707843386c5a2ef29e07a6 (diff)
downloadjenkins.debian.net-862643b7e777d87fd59a6cae0093f468f3cc4bee.tar.xz
reproducible debian: vary build path on testing/i386
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_build.sh8
-rwxr-xr-xbin/reproducible_common.sh1
2 files changed, 9 insertions, 0 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index f32fcb5d..966c806a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -594,6 +594,10 @@ export LANG="C"
unset LC_ALL
export LANGUAGE="en_US:en"
EOF
+ # build path is for now only varied on testing/i386
+ if [ "${ARCH}" = "i386" -a "${SUITE}" = "testing" ]; then
+ 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
( sudo timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice \
@@ -648,6 +652,10 @@ export LC_ALL="$locale.UTF-8"
export LANGUAGE="$locale:$language"
umask 0002
EOF
+ # build path is for now only varied on testing/i386
+ if [ "${ARCH}" = "i386" -a "${SUITE}" = "testing" ]; then
+ echo "BUILDDIR=/build-2nd" >> "$TMPCFG"
+ fi
set +e
# remember to change the sudoers setting if you change the following command
# (the 2nd build gets a longer timeout trying to make sure the first build
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index af1275d6..81148cfc 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -410,6 +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 directory</td><td>/build-1st <em>(currently testing/i386 only)</em></td><td>/build-2nd <em>(currently testing/i386 only)</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>"