From 50e5df74f06836aed205cfc9428a4428b334df6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 29 Aug 2018 19:06:05 +0200
Subject: Add better support for template specific workspace

---
 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 2c9e1ec..a916dc5 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -1,7 +1,6 @@
 #!/bin/sh
 # vim: ft=sh
 set -e
-GWORKSPACE=~/workspace/turris4x
 . utils
 
 MAKE="make -j4 IS_TTY=1 BUILD_LOG=1"
@@ -18,14 +17,14 @@ else
 
 	echo_stage "Get turris-build"
 	HASH="$(awk '/ \* turris-build\: /{print $3}' git-hash)"
-	git_clone "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build "$HASH"
+	git_fetch_t "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build "$HASH"
 
 	echo_stage "Prepare SDK"
 	mkdir openwrt
 	cd openwrt
-	echo ../turris-build/compile_fw -t $BOARD -p $BRANCH repo_prepare
-	GIT_MIRROR="$GWORKSPACE/mirror" \
-		CCACHE_HOST_DIR="$GWORKSPACE/ccache-host" \
+	echo "Template workspace: $TWORKSPACE/openwrt-git-mirror"
+	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
 
-- 
cgit v1.2.3