summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-08-29 19:06:05 +0200
committerKarel Kočí <cynerd@email.cz>2018-08-29 19:21:01 +0200
commit50e5df74f06836aed205cfc9428a4428b334df6d (patch)
treeab0912f26a90f1147a49e79d0cc1f34c3d66dc11 /templates
parentc981ed19b3483e60ace93a5ef8bb3bf7c4669881 (diff)
downloadlaminar-cnf-50e5df74f06836aed205cfc9428a4428b334df6d.tar.gz
laminar-cnf-50e5df74f06836aed205cfc9428a4428b334df6d.tar.bz2
laminar-cnf-50e5df74f06836aed205cfc9428a4428b334df6d.zip
Add better support for template specific workspace
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/turris4x.run9
1 files changed, 4 insertions, 5 deletions
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