From 15f3b81176be945769a15574afe682552e9d770c Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 7 Mar 2016 15:28:19 +0100 Subject: reproducible debian: always build with all cores on all archs --- bin/reproducible_build.sh | 6 +----- bin/reproducible_common.sh | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 7b11cef1..376764fc 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -587,11 +587,7 @@ second_build() { echo "=============================================================================" set -x local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR) - NEW_NUM_CPU=$NUM_CPU - # on armhf we cannot guarantee we have a different number of cores between 1st+2nd build due to the chosen nodes... - if [ "$ARCH" = "armhf" ] ; then - NEW_NUM_CPU=$(echo $NUM_CPU-1|bc) - fi + NEW_NUM_CPU=$NUM_CPU # on amd64+i386 we vary this based on node choices (by design), on armhf only sometimes. cat > "$TMPCFG" << EOF BUILDUSERID=2222 BUILDUSERNAME=pbuilder2 diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 99d5f3a9..50915761 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -411,7 +411,7 @@ write_explaination_table() { write_page "env USERUSER=\"pbuilder1\"USER=\"pbuilder2\"" write_page "uiduid=1111uid=2222" write_page "gidgid=1111gid=2222" - write_page "env DEB_BUILD_OPTIONSDEB_BUILD_OPTIONS=\"parallel=XXX\"
  XXX for amd64: 18 or 17
  XXX for armhf: 4 or 2DEB_BUILD_OPTIONS=\"parallel=YYY\"
  YYY for amd64: 17 or 18 (!= the first build)
  YYY for armhf: 1 or 3" + write_page "env DEB_BUILD_OPTIONSDEB_BUILD_OPTIONS=\"parallel=XXX\"
  XXX for amd64: 18 or 17
  XXX for armhf: 8, 4 or 2DEB_BUILD_OPTIONS=\"parallel=YYY\"
  YYY for amd64: 17 or 18 (!= the first build)
  YYY for armhf: 8, 4, or 2 (not varied systematically)" write_page "UTS namespaceshared with the hostmodified using /usr/bin/unshare --uts" else write_page "env USER is not yet varied between rebuilds of $1." -- cgit v1.2.3-54-g00ecf