summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2018-08-29 13:10:10 +0200
committerKarel Kočí <karel.koci@nic.cz>2018-08-29 13:10:10 +0200
commit083739a89ba55e64d35db3c14e4eca991e2cce11 (patch)
tree494daa1e716a138160a9de6345e48553ac85c084
parentaa541b618433846ef06c09a3ee64644b8bdaf4fd (diff)
downloadlaminar-cnf-083739a89ba55e64d35db3c14e4eca991e2cce11.tar.gz
laminar-cnf-083739a89ba55e64d35db3c14e4eca991e2cce11.tar.bz2
laminar-cnf-083739a89ba55e64d35db3c14e4eca991e2cce11.zip
turris4x: fix check if we should update sdk
-rwxr-xr-xtemplates/turris4x.run10
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/turris4x.run b/templates/turris4x.run
index e4f8e71..2c9e1ec 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -6,11 +6,11 @@ GWORKSPACE=~/workspace/turris4x
MAKE="make -j4 IS_TTY=1 BUILD_LOG=1"
-curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash
laminar_self_lock sdk
+curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash
if [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$WORKSPACE/openwrt-git-hash"; then
echo_info "Using previous version of SDK"
- cp -a "$WORKSPACE/sdk" openwrt
+ cp -a "$WORKSPACE/openwrt-sdk" openwrt
cd openwrt
else
@@ -35,9 +35,9 @@ else
echo_stage "Store SDK in workspace"
cd ..
- rm -rf "$WORKSPACE/sdk"
- cp -a openwrt "$WORKSPACE/sdk"
- cp git-hash "$WORKSPACE/git-hash"
+ rm -rf "$WORKSPACE/openwrt-sdk"
+ cp -a openwrt "$WORKSPACE/openwrt-sdk"
+ cp git-hash "$WORKSPACE/openwrt-git-hash"
cd openwrt
fi