diff options
| author | Karel Kočí <cynerd@email.cz> | 2020-04-21 15:01:00 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2020-04-21 15:01:00 +0200 |
| commit | 780cb9d9328b535f2c31409014882d254af021ca (patch) | |
| tree | 1463c35f499518e85bcfb736981871d13cd580e1 | |
| parent | 19571875f1c6dc3742f643f4097e11b51dc9338e (diff) | |
| download | laminar-cnf-780cb9d9328b535f2c31409014882d254af021ca.tar.gz laminar-cnf-780cb9d9328b535f2c31409014882d254af021ca.tar.bz2 laminar-cnf-780cb9d9328b535f2c31409014882d254af021ca.zip | |
turris: better output and do not fail on missing defaults.sh
| -rwxr-xr-x | templates/turris.run | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/turris.run b/templates/turris.run index fe19330..92c6f15 100755 --- a/templates/turris.run +++ b/templates/turris.run @@ -24,8 +24,9 @@ else ( cd turris-build "$FILES/turris_checkout_repo_branch.sh" "$ANIMAL" - cat feeds.conf ) + echo_info "Target feeds.conf" + cat turris-build/feeds.conf echo_stage "Prepare SDK" mkdir openwrt @@ -37,7 +38,6 @@ else CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" EOF - sed -i 's/^PUBLISH_BRANCH="hbs"$/PUBLISH_BRANCH="hbk"/' defaults.sh # Tweak target to point to HBK ../turris-build/compile_pkgs -t "$BOARD" -p "$ANIMAL" $parallel \ prepare_tools autopkg $make package/usign/host/compile |