1.1 --- a/config/global/download.in Sat Nov 13 23:26:21 2010 +0100
1.2 +++ b/config/global/download.in Tue Nov 16 10:00:27 2010 +0100
1.3 @@ -91,21 +91,6 @@
1.4
1.5 Note that this value applies equally to wget if you have that installed.
1.6
1.7 -config DOWNLOAD_MAX_CHUNKS
1.8 - int
1.9 - prompt "Maximum number of // chunks"
1.10 - default 1
1.11 - range 1 10
1.12 - help
1.13 - If you have aria2 installed, then it will be used to download files.
1.14 - Aria2 can split the download in chunks, and download those chunks in //
1.15 - which can be interesting to speed up the download.
1.16 -
1.17 - On the other hand, using many chunks, or even chunking in general, may
1.18 - be seen by some site admins as being kind of unfair, or even as a DoS.
1.19 - That's why the range of acceptable values is [1..10], and the default
1.20 - is 5 (aria2's default).
1.21 -
1.22 config ONLY_DOWNLOAD
1.23 bool
1.24 prompt "Stop after downloading tarballs"
2.1 --- a/configure Sat Nov 13 23:26:21 2010 +0100
2.2 +++ b/configure Tue Nov 16 10:00:27 2010 +0100
2.3 @@ -358,7 +358,7 @@
2.4 ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \
2.5 err="'libtool' 1.5.26 or above was not found"
2.6 has_or_abort prog=stat
2.7 -has_or_abort prog="aria2c curl wget"
2.8 +has_or_abort prog="curl wget"
2.9 has_or_abort prog=cvs
2.10 has_or_abort prog=patch
2.11 has_or_abort prog=tar
3.1 --- a/scripts/build/libc/newlib.sh Sat Nov 13 23:26:21 2010 +0100
3.2 +++ b/scripts/build/libc/newlib.sh Tue Nov 16 10:00:27 2010 +0100
3.3 @@ -16,14 +16,10 @@
3.4 do_libc_get() {
3.5 local libc_src
3.6 local avr32headers_src
3.7 - local save_chunks
3.8
3.9 libc_src="ftp://sources.redhat.com/pub/newlib"
3.10 avr32headers_src="http://dev.doredevelopment.dk/avr32-toolchain/sources"
3.11
3.12 - save_chunks="${CT_DOWNLOAD_MAX_CHUNKS}"
3.13 - CT_DOWNLOAD_MAX_CHUNKS=1
3.14 -
3.15 if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then
3.16 CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src}
3.17 else
3.18 @@ -37,8 +33,6 @@
3.19 if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
3.20 CT_GetFile "avr32headers" ${avr32headers_src}
3.21 fi
3.22 -
3.23 - CT_DOWNLOAD_MAX_CHUNKS="${save_chunks}"
3.24 }
3.25
3.26 do_libc_extract() {
4.1 --- a/scripts/functions Sat Nov 13 23:26:21 2010 +0100
4.2 +++ b/scripts/functions Tue Nov 16 10:00:27 2010 +0100
4.3 @@ -383,31 +383,16 @@
4.4 || rm -f "${1##*/}"
4.5 }
4.6
4.7 -# Download using aria2
4.8 -# Usage: CT_DoGetFileAria2 <URL>
4.9 -CT_DoGetFileAria2() {
4.10 - # Note: comments about curl method (above) are also valid here
4.11 - # Plus: default progress indicator is a single line, so use verbose log
4.12 - # so that the CT-NG's ouput is 'live'.
4.13 - CT_DoExecLog ALL aria2c --summary-interval=1 -s ${CT_DOWNLOAD_MAX_CHUNKS} -m 3 -t ${CT_CONNECT_TIMEOUT} -p "$1" \
4.14 - || CT_DoExecLog ALL aria2c --summary-interval=1 -s ${CT_DOWNLOAD_MAX_CHUNKS} -m 3 -t ${CT_CONNECT_TIMEOUT} "$1" \
4.15 - || rm -f "${1##*/}"
4.16 -}
4.17 -
4.18 # OK, just look if we have them...
4.19 -_aria2c=$(CT_Which aria2c)
4.20 _wget=$(CT_Which wget)
4.21 _curl=$(CT_Which curl)
4.22
4.23 # Wrapper function to call one of, in order of preference:
4.24 -# aria2
4.25 # curl
4.26 # wget
4.27 # Usage: CT_DoGetFile <URL>
4.28 CT_DoGetFile() {
4.29 - if [ -n "${_aria2c}" -a ${CT_DOWNLOAD_MAX_CHUNKS} -gt 1 ]; then
4.30 - CT_DoGetFileAria2 "$1"
4.31 - elif [ -n "${_curl}" ]; then
4.32 + if [ -n "${_curl}" ]; then
4.33 CT_DoGetFileCurl "$1"
4.34 elif [ -n "${_wget}" ]; then
4.35 CT_DoGetFileWget "$1"