summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_build.sh6
-rwxr-xr-xbin/reproducible_common.sh2
2 files changed, 2 insertions, 6 deletions
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 "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>"
write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
- write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />&nbsp;&nbsp;XXX for amd64: 18 or 17<br />&nbsp;&nbsp;XXX for armhf: 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY for amd64: 17 or 18 (!= the first build)<br />&nbsp;&nbsp;YYY for armhf: 1 or 3</td></tr>"
+ write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />&nbsp;&nbsp;XXX for amd64: 18 or 17<br />&nbsp;&nbsp;XXX for armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY for amd64: 17 or 18 (!= the first build)<br />&nbsp;&nbsp;YYY for armhf: 8, 4, or 2 (not varied systematically)</td></tr>"
write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"
else
write_page "<tr><td>env USER</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"