diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/libc/newlib.sh | 6 | ||||
| -rw-r--r-- | scripts/functions | 17 |
2 files changed, 1 insertions, 22 deletions
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 0593a663..590c5eb1 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -16,14 +16,10 @@ libc_newlib_version() { do_libc_get() { local libc_src local avr32headers_src - local save_chunks libc_src="ftp://sources.redhat.com/pub/newlib" avr32headers_src="http://dev.doredevelopment.dk/avr32-toolchain/sources" - save_chunks="${CT_DOWNLOAD_MAX_CHUNKS}" - CT_DOWNLOAD_MAX_CHUNKS=1 - if [ -z "${CT_LIBC_NEWLIB_CVS}" ]; then CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src} else @@ -37,8 +33,6 @@ do_libc_get() { if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then CT_GetFile "avr32headers" ${avr32headers_src} fi - - CT_DOWNLOAD_MAX_CHUNKS="${save_chunks}" } do_libc_extract() { diff --git a/scripts/functions b/scripts/functions index fc71715a..f7f30575 100644 --- a/scripts/functions +++ b/scripts/functions @@ -383,31 +383,16 @@ CT_DoGetFileCurl() { || rm -f "${1##*/}" } -# Download using aria2 -# Usage: CT_DoGetFileAria2 <URL> -CT_DoGetFileAria2() { - # Note: comments about curl method (above) are also valid here - # Plus: default progress indicator is a single line, so use verbose log - # so that the CT-NG's ouput is 'live'. - CT_DoExecLog ALL aria2c --summary-interval=1 -s ${CT_DOWNLOAD_MAX_CHUNKS} -m 3 -t ${CT_CONNECT_TIMEOUT} -p "$1" \ - || CT_DoExecLog ALL aria2c --summary-interval=1 -s ${CT_DOWNLOAD_MAX_CHUNKS} -m 3 -t ${CT_CONNECT_TIMEOUT} "$1" \ - || rm -f "${1##*/}" -} - # OK, just look if we have them... -_aria2c=$(CT_Which aria2c) _wget=$(CT_Which wget) _curl=$(CT_Which curl) # Wrapper function to call one of, in order of preference: -# aria2 # curl # wget # Usage: CT_DoGetFile <URL> CT_DoGetFile() { - if [ -n "${_aria2c}" -a ${CT_DOWNLOAD_MAX_CHUNKS} -gt 1 ]; then - CT_DoGetFileAria2 "$1" - elif [ -n "${_curl}" ]; then + if [ -n "${_curl}" ]; then CT_DoGetFileCurl "$1" elif [ -n "${_wget}" ]; then CT_DoGetFileWget "$1" |