From 4bdc95346259f5b88520f038669ddf398f5db46f Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 23 May 2015 23:12:49 +0200 Subject: reproducible: vary number of cores between 1st and 2nd build --- bin/reproducible_build.sh | 2 +- bin/reproducible_html_graphs.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index ec169668..89872a0f 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -412,7 +412,7 @@ build_rebuild() { set -x printf "BUILDUSERID=2222\nBUILDUSERNAME=pbuilder2\n" > $TMPCFG ( timeout 12h nice ionice -c 3 sudo \ - DEB_BUILD_OPTIONS="parallel=$NUM_CPU" \ + DEB_BUILD_OPTIONS="parallel=$(echo $NUM_CPU-1|bc)" \ TZ="/usr/share/zoneinfo/Etc/GMT-14" \ LANG="fr_CH.UTF-8" \ LC_ALL="fr_CH.UTF-8" \ diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index 16e9be41..5b870015 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -593,7 +593,8 @@ create_main_stats_page() { write_page "kernel version, modified using /usr/bin/linux64 --uname-2.6$(uname -sr)$(/usr/bin/linux64 --uname-2.6 uname -sr)" write_page "umask00220002" write_page "CPU type$(cat /proc/cpuinfo|grep 'model name'|head -1|cut -d ":" -f2-)same for both builds (currently, work in progress)" - write_page "number of cores used$(cat /proc/cpuinfo |grep ^processor|wc -l)(currently, work in progress)" + local NUM_CPU=$(cat /proc/cpuinfo |grep ^processor|wc -l) + write_page "number of cores used$NUM_CPU$(echo $NUM_CPU-1|bc)" write_page "year, month, datetoday ($DATE)same for both builds (currently, work in progress)" write_page "hour, minutehour is usually the same...the minute differs (currently, work in progress)" write_page "" -- cgit v1.2.3-70-g09d2