From e56414de87c5115bca6646c45ba139da6daaec4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 13 Jul 2020 14:43:39 +0200 Subject: turris: do not fail if one package fails --- templates/turris.run | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/turris.run b/templates/turris.run index b392f63..f51f29b 100755 --- a/templates/turris.run +++ b/templates/turris.run @@ -53,8 +53,11 @@ find feeds/personal -type d -exec test -f '{}/Makefile' \; -prune -printf "%P\0" xargs -0 ./scripts/feeds uninstall # Remove any package provided by personal feed ./scripts/feeds install -p personal -d y -f -a echo_stage "Compile packages from personal feed" -find package/feeds/personal -mindepth 1 -maxdepth 1 -printf 'package/%P/compile\0' | \ - xargs -n 1 --null $make +find package/feeds/personal -mindepth 1 -maxdepth 1 -printf '%P\0' | \ + while IFS=$'\0' read -r package; do + $make "package/$package/compile" || \ + echo_error "Package build failed: $package" + done echo_stage "Generate index and sign" $make package/index BUILD_KEY=~/openwrt-repo.sec -- cgit v1.2.3