From 359426679613a2a1f87cdbd482093879da015c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Wed, 29 Aug 2018 10:40:54 +0200
Subject: turris4x: Try to improve disk usage

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

(limited to 'templates/turris4x.run')

diff --git a/templates/turris4x.run b/templates/turris4x.run
index 4465d66..f83619f 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -1,6 +1,7 @@
 #!/bin/sh
 # vim: ft=sh
 set -e
+GWORKSPACE=~/workspace/turris4x
 . utils
 
 MAKE="make -j4 IS_TTY=1 BUILD_LOG=1"
@@ -20,20 +21,20 @@ else
 
 	echo_stage "Get turris-build"
 	HASH="$(awk '/ \* turris-build\: /{print $3}' git-hash)"
-	HASH="9544f32cf06c29aedf8c3d88b9ff8745179dfa69" # TODO remove this when repo_checkout is integrated
 	git_clone "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="$WORKSPACE/mirror" \
-		CCACHE_HOST_DIR="$WORKSPACE/ccache-host" \
+	GIT_MIRROR="$GWORKSPACE/mirror" \
+		CCACHE_HOST_DIR="$GWORKSPACE/ccache-host" \
 		CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" \
 		../turris-build/compile_fw -t $BOARD -p $BRANCH repo_prepare
 
 	echo_stage "Compile tools"
-	$MAKE tools/compile toolchain/compile package/usign/host/compile
+	$MAKE toolchain/compile package/usign/host/compile
+	rm -rf build_dir
 
 	echo_stage "Store SDK in workspace"
 	cd ..
@@ -54,7 +55,7 @@ echo_stage "Compile packages from our feed"
 $MAKE $(./scripts/feeds list -r personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ')
 
 echo_stage "Generate index and sign"
-$MAKE -j1 V=99 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