From 780cb9d9328b535f2c31409014882d254af021ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 21 Apr 2020 15:01:00 +0200 Subject: turris: better output and do not fail on missing defaults.sh --- templates/turris.run | 4 ++-- 1 file 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 -- cgit v1.2.3