diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-09 17:01:00 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-09 17:01:00 +0200 |
| commit | 0c2430b06357b78249d92288a8c77fe77919eec5 (patch) | |
| tree | ce42ba2519b213480cfcdebac47ea741f82e1270 | |
| parent | 581864587d0bfb914cf1ec69c5d99455da026283 (diff) | |
| download | jenkins.debian.net-0c2430b06357b78249d92288a8c77fe77919eec5.tar.xz | |
reproducible: always use all cores for the 2nd build on armhf
| -rwxr-xr-x | bin/reproducible_build.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 27a82b20..518531e8 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -473,10 +473,15 @@ EOF second_build() { 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 + if [ "$ARCH" = "armhf" ] ; then + NEW_NUM_CPU=$NUM_CPU + fi cat > "$TMPCFG" << EOF BUILDUSERID=2222 BUILDUSERNAME=pbuilder2 -export DEB_BUILD_OPTIONS="parallel=$(echo $NUM_CPU-1|bc)" +export DEB_BUILD_OPTIONS="parallel=$NUM_CPU" export TZ="/usr/share/zoneinfo/Etc/GMT-14" export LANG="fr_CH.UTF-8" export LC_ALL="fr_CH.UTF-8" |