From 7ed748910f1927a55abdb52511c94f79435d9cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 8 Jul 2020 18:09:02 +0200
Subject: turris: use force-make machinery to not need to debug on server

This is now configured so that if build of package fails it runs
compilation again with logs printed.
---
 templates/turris.run | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/turris.run b/templates/turris.run
index 274e5bc..b0ea26e 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -3,11 +3,8 @@
 . "$(dirname "$(readlink -f "$0")")/../job.common"
 ###################################################
 compile_params="-j$(nproc) -f"
-make="make -j$(($(nproc) * 2)) -l$(nproc) BUILD_LOG=1"
-if [ "$V" -ge 1 ]; then
-	compile_params="-j1 -f"
-	make="make -j1 BUILD_LOG=1 V=99"
-fi
+num_jobs="$(($(nproc) * 2))"
+make="force-make -j$num_jobs -d$num_jobs -f 'V=99' -- -l$(nproc) BUILD_LOG=1"
 ###################################################
 export IS_TTY=1
 # TODO take lock so we won't run multiple instances of new builds
-- 
cgit v1.2.3