diff options
| -rwxr-xr-x | bin/reproducible_build.sh | 8 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index c34de79d..cd261f8d 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -594,7 +594,9 @@ 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/1st" >> "$TMPCFG" + else + echo "BUILDDIR=/build" >> "$TMPCFG" fi # remember to change the sudoers setting if you change the following command # FIXME: call with --buildinfo-identifier=dummy instead and below @@ -653,7 +655,9 @@ umask 0002 EOF # build path is not yet varied on testing if [ "${SUITE}" != "testing" ]; then - echo "BUILDDIR=/build-2nd" >> "$TMPCFG" + echo "BUILDDIR=/build/2nd" >> "$TMPCFG" + else + echo "BUILDDIR=/build" >> "$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 43b830f7..7ba07981 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -419,7 +419,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/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 /> 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>" |