diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-08-20 01:04:59 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-08-20 01:04:59 +0200 |
| commit | aceab8c8958602672a6a0fc7289b391ff23804b9 (patch) | |
| tree | d3f1d4f1860521542b0a74c4bc51402f9afaba47 /bin | |
| parent | 3632773a60cabff3c4c83e543da504ee305662a1 (diff) | |
| download | jenkins.debian.net-aceab8c8958602672a6a0fc7289b391ff23804b9.tar.xz | |
reproducible Debian: vary the build path on all suites except testing
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reproducible_build.sh | 8 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 11727ffd..24b47279 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -594,8 +594,8 @@ 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 + # build path is not yet varied on testing + if [ "${SUITE}" != "testing" ]; then echo "BUILDDIR=/build-1st" >> "$TMPCFG" fi # remember to change the sudoers setting if you change the following command @@ -652,8 +652,8 @@ 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 + # build path is not yet varied on testing + if [ "${SUITE}" != "testing" ]; then echo "BUILDDIR=/build-2nd" >> "$TMPCFG" fi set +e diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index c9129509..6c9c223e 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 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>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>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>" |