diff options
-rw-r--r-- | mk/fetch.mk | 2 | ||||
-rw-r--r-- | rules.mk | 2 | ||||
-rwxr-xr-x | scripts/prereq.sh | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/mk/fetch.mk b/mk/fetch.mk index a7fa86aff..743626378 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -89,7 +89,7 @@ $(1): for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \ : echo "$${FETCHCMD} $$$$site$$$$filename"; \ rm -f "$$$$filename"; \ - if $${FETCHCMD} $$$$filename $$$$site$$$$filename; then \ + if $${FETCHCMD} $$$$filename $$$$site$$$$filename $(DL_TRACE); then \ : check the size here; \ [[ ! -e $$$$filename ]] || exit 0; \ fi; \ @@ -11,6 +11,7 @@ TRACE:= : CMD_TRACE:= : PKG_TRACE:= : MAKE_TRACE:= +DL_TRACE:= EXTRA_MAKEFLAGS:= SET_DASHX:= set -x else @@ -21,6 +22,7 @@ CMD_TRACE:= echo -n PKG_TRACE:= echo "------> " EXTRA_MAKEFLAGS:= -s MAKE_TRACE:= >/dev/null 2>&1 || { echo "Build failed. Please re-run make with v to see what's going on"; false; } +DL_TRACE:= >/dev/null 2>&1 SET_DASHX:= : endif diff --git a/scripts/prereq.sh b/scripts/prereq.sh index e9391357e..68bea8f50 100755 --- a/scripts/prereq.sh +++ b/scripts/prereq.sh @@ -42,10 +42,6 @@ if [ -e foo ]; then fi rm -f FOO -if [ "$target" = "v" ]; then - dlverbose=1 -fi - # do we have a download tool? tools="curl wget" for tool in $tools; do @@ -54,18 +50,10 @@ for tool in $tools; do printf "found\n" case $tool in curl) - if [ $dlverbose -eq 1 ]; then FETCHCMD="$(which $tool) -L -k -f -\# -o " - else - FETCHCMD="$(which $tool) -L -k -f -s -o " - fi ;; wget) - if [ $dlverbose -eq 1 ]; then FETCHCMD="$(which $tool) --no-check-certificate -O " - else - FETCHCMD="$(which $tool) --no-check-certificate -q -O " - fi ;; esac break |