Commit ba2c9f6b authored by Holger Levsen's avatar Holger Levsen

do not reinvent nproc, thanks to Andreas Beckmann for the hint

Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 4a031204
#!/bin/bash
# Copyright 2012-2016 Holger Levsen <holger@layer-acht.org>
# Copyright 2012-2018 Holger Levsen <holger@layer-acht.org>
# 2016 Phil Hands <phil@hands.com>
# released under the GPLv=2
......@@ -128,7 +128,7 @@ pdebuild_package() {
# build (binary packages only, as sometimes we cannot get the upstream tarball...)
#
SOURCE=$(dpkg-parsechangelog |grep ^Source: | cut -d " " -f2)
NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
NUM_CPU=$(nproc)
#
# if we got a valid TRIGGERING_BRANCH passed in as a parameter from the triggering job
# then grab the generated udebs. FIXME -- we need to work out a way of cleaning up old branches
......
#!/bin/bash
# vim: set noexpandtab:
# Copyright 2012,2014 Holger Levsen <holger@layer-acht.org>
# Copyright 2012-2018 Holger Levsen <holger@layer-acht.org>
# © 2018 Mattia Rizzolo <mattia@debian.org>
# released under the GPLv=2
......@@ -48,7 +48,7 @@ pdebuild_package() {
# build
#
cd manual
NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
NUM_CPU=$(nproc)
pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU" -- --http-proxy $http_proxy
#
# publish and cleanup
......
......@@ -66,7 +66,7 @@ RPM_BUILD_NODE=profitbricks-build3-amd64
RPM_PKGS=/srv/reproducible-results/rpm_pkgs
# number of cores to be used
NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
NUM_CPU=$(nproc)
# diffoscope memory limit in kilobytes
DIFFOSCOPE_VIRT_LIMIT=$((10*1024*1024))
......
#!/bin/bash
# Copyright 2015-2016 Holger Levsen <holger@layer-acht.org>
# Copyright 2015-2018 Holger Levsen <holger@layer-acht.org>
# released under the GPLv=2
DEBUG=false
......@@ -10,7 +10,7 @@ set -e
# these variables also need to be in bin/reproducible_common.sh where they define $BUILD_ENV_VARS (see right below)
ARCH=$(dpkg --print-architecture)
NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
NUM_CPU=$(nproc)
CPU_MODEL=$(cat /proc/cpuinfo |grep "model name"|head -1|cut -d ":" -f2|xargs echo)
DATETIME=$(date +'%Y-%m-%d %H:%M %Z')
KERNEL=$(uname -smrv)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment