From 0e3a0dab9c307be49c4994d31614f9ffb2985771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 10 Oct 2018 15:50:53 +0200
Subject: turris4x: use compile_fw to compile SDK not plain make

---
 templates/turris4x.run | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'templates/turris4x.run')

diff --git a/templates/turris4x.run b/templates/turris4x.run
index e53622d..7118362 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -3,9 +3,11 @@
 . "$(dirname "$(readlink -f "$0")")/../job.common"
 
 if [ "$V" -ge 1 ]; then
-	MAKE="make -j1 IS_TTY=1 BUILD_LOG=1 V=99"
+	njobs="-j1"
+	make="make $njobs IS_TTY=1 BUILD_LOG=1 V=99"
 else
-	MAKE="make -j4 IS_TTY=1 BUILD_LOG=1"
+	njobs="-j4"
+	make="make $njobs IS_TTY=1 BUILD_LOG=1"
 fi
 
 curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash
@@ -27,8 +29,7 @@ else
 		GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror" \
 			CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" \
 			CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" \
-			../turris-build/compile_fw -t $BOARD -p $BRANCH repo_prepare
-		$MAKE tools/compile toolchain/compile target/compile package/usign/host/compile
+			../turris-build/compile_fw -a "$njobs" -t $BOARD -p $BRANCH repo_prepare prepare_tools
 		rm -rf build_dir
 		cd ..
 		rm -rf "$WORKSPACE/openwrt-sdk"
@@ -45,10 +46,10 @@ echo "src-git personal git@cynerd.cz:openwrt-personal-pkgs" >> feeds.conf
 ./scripts/feeds install -p personal -d y -f -a
 
 echo_stage "Compile packages from personal feed"
-$MAKE $(ls package/feeds/personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ')
+$make $(ls package/feeds/personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ')
 
 echo_stage "Generate index and sign"
-$MAKE package/index BUILD_KEY=~/openwrt-repo.key
+$make package/index BUILD_KEY=~/openwrt-repo.key
 
 echo_stage "Deploy"
 ssh upload rm -rf "deploy-turris4x-$BOARD"
-- 
cgit v1.2.3