From aceab8c8958602672a6a0fc7289b391ff23804b9 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 20 Aug 2016 01:04:59 +0200 Subject: reproducible Debian: vary the build path on all suites except testing --- bin/reproducible_build.sh | 8 ++++---- bin/reproducible_common.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'bin') 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 "uiduid=1111uid=2222" write_page "gidgid=1111gid=2222" write_page "/bin/sh/bin/dash/bin/bash" - write_page "build directory/build-1st (currently testing/i386 only)/build-2nd (currently testing/i386 only)" + write_page "build path/build-1st (not varied for stretch)/build-2nd (not varied for stretch)" write_page "user's login shell/bin/sh/bin/bash" write_page "env DEB_BUILD_OPTIONSDEB_BUILD_OPTIONS=\"parallel=XXX\"
  XXX on amd64 and i386: 18 or 17
  XXX on armhf: 8, 4 or 2DEB_BUILD_OPTIONS=\"parallel=YYY\"
  YYY on amd64 and i386: 17 or 18 (!= the first build)
  YYY on armhf: 8, 4, or 2 (not varied systematically)" write_page "UTS namespaceshared with the hostmodified using /usr/bin/unshare --uts" -- cgit v1.2.3-70-g09d2