Commit ba2c9f6b authored by Holger Levsen's avatar Holger Levsen
Browse files

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



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 4a031204

bin/d-i_build.sh

+2 −2
Original line number Diff line number Diff line 
#!/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/d-i_manual.sh

+2 −2
Original line number Diff line number Diff line 
#!/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

bin/reproducible_common.sh

+1 −1
Original line number Diff line number Diff line
@@ -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/reproducible_info.sh

+2 −2
Original line number Diff line number Diff line 
#!/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)