From 9dbbc8e5f6edf0e1386b4ba28d96918fa64fa2b5 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 16 Nov 2010 10:00:27 +0100
Subject: scripts: remove aria2c as downloader, retain only curl and wget

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/config/global/download.in b/config/global/download.in
index 153fd5e..02954f0 100644
--- a/config/global/download.in
+++ b/config/global/download.in
@@ -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"
diff --git a/configure b/configure
index 91574d2..70263c8 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index 0593a66..590c5eb 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 fc71715..f7f3057 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"
-- 
cgit v0.10.2-6-g49f6