diff options
| author | Karel Kočí <cynerd@email.cz> | 2020-11-24 13:25:25 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2020-11-24 13:27:04 +0100 |
| commit | 449b271d9e8365fb53101c346cdd3e825cfaaec5 (patch) | |
| tree | e14181180264ac2f8e64df544e147b7f6860b45d /templates | |
| parent | 6185cbd7e5ccd7fa77516d3383932b423670640a (diff) | |
| download | laminar-cnf-449b271d9e8365fb53101c346cdd3e825cfaaec5.tar.gz laminar-cnf-449b271d9e8365fb53101c346cdd3e825cfaaec5.tar.bz2 laminar-cnf-449b271d9e8365fb53101c346cdd3e825cfaaec5.zip | |
turris: fix how we checkout repository
We can checkout HEAD and just use checkout_repo_branch.sh.
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/turris.run | 5 |
1 files changed, 3 insertions, 2 deletions
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 ) |