summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2020-04-21 15:13:26 +0200
committerKarel Kočí <cynerd@email.cz>2020-04-21 15:13:26 +0200
commit3f462a98c29e54411a69c6e9b5a4dde67841809a (patch)
tree178df8481314c80055648ceaf61f8c53604a7dce
parentaa0244c53138fc5d32bebc35c36e1b6156ed3e49 (diff)
downloadlaminar-cnf-3f462a98c29e54411a69c6e9b5a4dde67841809a.tar.gz
laminar-cnf-3f462a98c29e54411a69c6e9b5a4dde67841809a.tar.bz2
laminar-cnf-3f462a98c29e54411a69c6e9b5a4dde67841809a.zip
turris: revert to use git-hash to deted need for rebuild
-rwxr-xr-xtemplates/turris.run7
1 files changed, 3 insertions, 4 deletions
diff --git a/templates/turris.run b/templates/turris.run
index 57dfe1d..2f9b3a9 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -12,6 +12,9 @@ fi
export IS_TTY=1
# TODO take lock so we won't run multiple instances of new builds
+curl "https://repo.turris.cz/$ANIMAL/$BOARD/packages/git-hash" > git-hash
+cat git-hash
+
if [ -z "$CLEAN" ] && [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$WORKSPACE/openwrt-git-hash"; then
echo_info "Using previous version of SDK"
tar -xzf "$WORKSPACE/openwrt.tar.gz"
@@ -19,14 +22,10 @@ else
echo_info "Building new version of SDK"
echo_stage "Get turris-build"
git_fetch_t "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build "$ANIMAL"
-
- echo_stage "Checkout appropriate branch"
(
cd turris-build
"$FILES/turris_checkout_repo_branch.sh" "$ANIMAL"
)
- echo_info "Target feeds.conf"
- cat turris-build/feeds.conf
echo_stage "Prepare SDK"
mkdir openwrt