From a237d34158be871f474bbbe1079d6c32fc178bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 11 Oct 2018 14:39:01 +0200
Subject: turris4x: fix how we use compile_fw

Using prepare_tools resets stuff prepared by repo_prepare.
---
 templates/turris4x.run | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'templates/turris4x.run')

diff --git a/templates/turris4x.run b/templates/turris4x.run
index 3b16bc1..4d18de8 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -3,11 +3,9 @@
 . "$(dirname "$(readlink -f "$0")")/../job.common"
 
 if [ "$V" -ge 1 ]; then
-	njobs="-j1"
-	make="make $njobs IS_TTY=1 BUILD_LOG=1 V=99"
+	make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99"
 else
-	njobs="-j4"
-	make="make $njobs IS_TTY=1 BUILD_LOG=1"
+	make="make -j4 IS_TTY=1 BUILD_LOG=1"
 fi
 
 curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash
@@ -28,7 +26,8 @@ else
 	GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror" \
 		CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" \
 		CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" \
-		../turris-build/compile_fw -a "$njobs" -t $BOARD -p $BRANCH repo_prepare prepare_tools
+		../turris-build/compile_fw -a "$njobs" -t $BOARD -p $BRANCH repo_prepare
+	$make toolchain/compile target/compile
 	cd ..
 	tar -czf openwrt.tar.gz openwrt
 	mv openwrt.tar.gz "$WORKSPACE/openwrt.tar.gz"
-- 
cgit v1.2.3