From 449b271d9e8365fb53101c346cdd3e825cfaaec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 24 Nov 2020 13:25:25 +0100 Subject: turris: fix how we checkout repository We can checkout HEAD and just use checkout_repo_branch.sh. --- templates/turris.run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/turris.run b/templates/turris.run index 0699418..4d87544 100755 --- a/templates/turris.run +++ b/templates/turris.run @@ -24,10 +24,11 @@ if [ -z "$CLEAN" ] && [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$ 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" + # TODO once TOS 5.2.0 lands in HBT we can just use HEAD + git_fetch_t "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build hbl ( cd turris-build - "$FILES/turris_checkout_repo_branch.sh" "$ANIMAL" + ./helpers/checkout_repo_branch.sh "$ANIMAL" cat feeds.conf patch -Np1 -r - < "$FILES/git-fetch-lock.patch" || true # just ignore if it fails ) -- cgit v1.2.3