From 3f462a98c29e54411a69c6e9b5a4dde67841809a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 21 Apr 2020 15:13:26 +0200
Subject: turris: revert to use git-hash to deted need for rebuild

---
 templates/turris.run | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'templates')

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
-- 
cgit v1.2.3