summaryrefslogtreecommitdiffstats
path: root/bin/reproducible_build.sh
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-04 16:22:51 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-04 16:22:51 +0100
commitdfa15e63fd98ec47f1d545f4bc7aaf2b8fa76a20 (patch)
treef6fba292520777dd1fde83796994fd4dc5ac565e /bin/reproducible_build.sh
parent88de8b87ad683580a5c582a032141432cb8341bf (diff)
downloadjenkins.debian.net-dfa15e63fd98ec47f1d545f4bc7aaf2b8fa76a20.tar.xz
reproducible: revert the logic, actually on armhf we cannot guarantee to have a different number of cores…
Diffstat (limited to 'bin/reproducible_build.sh')
-rwxr-xr-xbin/reproducible_build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index daffb38f..d5939c37 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -581,10 +581,10 @@ second_build() {
echo "============================================================================="
set -x
local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
- NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
- # on armhf we always have different number of cores between 1st+2nd build due to the chosen nodes
+ 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=$NUM_CPU
+ NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
fi
cat > "$TMPCFG" << EOF
BUILDUSERID=2222