ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-18 10:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts: remove aria2c as downloader, retain only curl and wget

Browse Source 
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2010-11-16 10:00:27 +01:00
parent 25953c386f
commit 9dbbc8e5f6
4 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/global/download.in
View File

@ -91,21 +91,6 @@ config CONNECT_TIMEOUT
Note that this value applies equally to wget if you have that installed.
config DOWNLOAD_MAX_CHUNKS
int
prompt "Maximum number of // chunks"
default 1
range 1 10
help
If you have aria2 installed, then it will be used to download files.
Aria2 can split the download in chunks, and download those chunks in //
which can be interesting to speed up the download.
On the other hand, using many chunks, or even chunking in general, may
be seen by some site admins as being kind of unfair, or even as a DoS.
That's why the range of acceptable values is [1..10], and the default
is 5 (aria2's default).
config ONLY_DOWNLOAD
bool
prompt "Stop after downloading tarballs"

2
configure vendored
View File

@ -358,7 +358,7 @@ has_or_abort prog=libtool
ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \
err="'libtool' 1.5.26 or above was not found"
has_or_abort prog=stat
has_or_abort prog="aria2c curl wget"
has_or_abort prog="curl wget"
has_or_abort prog=cvs
has_or_abort prog=patch
has_or_abort prog=tar

6
scripts/build/libc/newlib.sh
View File

@ -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() {

17
scripts/functions
View File

@ -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"