summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-16 21:52:55 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-16 21:52:55 +0200
commit488e08ed1d8e2eadb010a70871a6396427b09656 (patch)
tree5f229867ad0cd250a6448fed8269ca0282c12f00
parentb829ca86fd965795246086f1922f39104cbd531a (diff)
downloadjenkins.debian.net-488e08ed1d8e2eadb010a70871a6396427b09656.tar.xz
reproducible arch: set MAKEFLAGS=-jX in /etc/makepkg.conf
-rw-r--r--TODO1
-rwxr-xr-xbin/reproducible_build_arch_pkg.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/TODO b/TODO
index f8c405cb..84a026ac 100644
--- a/TODO
+++ b/TODO
@@ -303,7 +303,6 @@ properties:
** use -source schroot
** BOOTSTRAP_TAR_GZ=2015.08.01/archlinux-bootstrap-2015.08.01-x86_64.tar.gz needs to be replaced with a future proof filename
** download bootstrap.tar.gz sig and verify
-** build with -j X
** 'makepkg --skippgpcheck' should be replaced by 'makepkg' and 'echo "keyserver-options auto-key-retrieve" >> ~/.gnupg/gpg.conf'
*** this should make this obselete: 'schroot --directory /tmp -c source:jenkins-reproducible-arch -- grep ^validpgpkeys= $PKG/PKGBUILD|cut -d "'" -f2|xargs schroot --directory /tmp -c source:jenkins-reproducible-arch -- gpg --recv-keys'
** patch pacman to create .buildinfo files - or better: wait
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index 14b69c07..9422dc62 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -48,6 +48,7 @@ first_build() {
local SESSION="arch-$SRCPACKAGE-$(basename $TMPDIR)"
local BUILDDIR="/tmp/$SRCPACKAGE-$(basename $TMPDIR)"
schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-arch
+ echo "MAKEFLAGS=-j$NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/makepkg.conf
schroot --run-session -c $SESSION --directory /tmp -- mkdir $BUILDDIR
schroot --run-session -c $SESSION --directory /tmp -- cp -r /var/abs/core/$SRCPACKAGE $BUILDDIR/
schroot --run-session -c $SESSION --directory $BUILDDIR/$SRCPACKAGE -- makepkg --skippgpcheck
@@ -64,6 +65,8 @@ second_build() {
set -x
local SESSION="arch-$SRCPACKAGE-$(basename $TMPDIR)"
local BUILDDIR="/tmp/$SRCPACKAGE-$(basename $TMPDIR)"
+ NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
+ echo "MAKEFLAGS=-j$NEW_NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/makepkg.conf
schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-arch
schroot --run-session -c $SESSION --directory /tmp -- mkdir $BUILDDIR
schroot --run-session -c $SESSION --directory /tmp -- cp -r /var/abs/core/$SRCPACKAGE $BUILDDIR/