From b98d3cba8f7726de25317deb05832c583c6000c8 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Wed, 31 Aug 2016 14:36:22 +0000 Subject: Revert "Vary the lengths of the two build paths" It causes a too huge diff in the binaries, making diffoscope output unreadable. This reverts commit e5d053aefa5f6d5f54dc5ce4b33ce86ec4e26a0b. --- bin/reproducible_build.sh | 4 ++-- bin/reproducible_common.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 02b70b27..e7b56671 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -598,7 +598,7 @@ export LANGUAGE="en_US:en" EOF # build path is not yet varied on testing if [ "${SUITE}" != "testing" ]; then - echo "BUILDDIR=/build-first" >> "$TMPCFG" + 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 @@ -657,7 +657,7 @@ umask 0002 EOF # build path is not yet varied on testing if [ "${SUITE}" != "testing" ]; then - echo "BUILDDIR=/build-second" >> "$TMPCFG" + echo "BUILDDIR=/build-2nd" >> "$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 11f247a3..2cb89f46 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 path/build-first (not varied for stretch)/build-second (not varied for stretch)" + 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 "user's GECOSfirst user,first room,first work-phone,first home-phone,first othersecond user,second room,second work-phone,second home-phone,second other" 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)" -- cgit v1.2.3-70-g09d2