summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2020-07-08 18:09:02 +0200
committerKarel Kočí <cynerd@email.cz>2020-07-08 18:09:02 +0200
commit7ed748910f1927a55abdb52511c94f79435d9cd7 (patch)
tree0f3e8e294edec9f337bff2333e4d72b5d291bcfd /templates
parent09e0b373a617b4c6cffbbcf63e62e393159da44d (diff)
downloadlaminar-cnf-7ed748910f1927a55abdb52511c94f79435d9cd7.tar.gz
laminar-cnf-7ed748910f1927a55abdb52511c94f79435d9cd7.tar.bz2
laminar-cnf-7ed748910f1927a55abdb52511c94f79435d9cd7.zip
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.
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/turris.run7
1 files changed, 2 insertions, 5 deletions
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