diff options
| -rw-r--r-- | scripts/build/binutils.sh | 5 | ||||
| -rw-r--r-- | scripts/build/cc_gcc.sh | 6 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 8 | ||||
| -rw-r--r-- | scripts/build/debug/400-ltrace.sh | 2 | ||||
| -rw-r--r-- | scripts/build/gmp.sh | 4 | ||||
| -rw-r--r-- | scripts/build/kernel_linux.sh | 7 | ||||
| -rw-r--r-- | scripts/build/libc_glibc.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc_uClibc.sh | 2 |
8 files changed, 14 insertions, 24 deletions
diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh index 4fb94b6..2de697d 100644 --- a/scripts/build/binutils.sh +++ b/scripts/build/binutils.sh @@ -8,9 +8,8 @@ do_print_filename() { # Download binutils do_binutils_get() { - CT_GetFile "${CT_BINUTILS_FILE}" \ - ftp://ftp.gnu.org/gnu/binutils \ - ftp://ftp.kernel.org/pub/linux/devel/binutils + CT_GetFile "${CT_BINUTILS_FILE}" \ + {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils } # Extract binutils diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh index 92dc405..8578caf 100644 --- a/scripts/build/cc_gcc.sh +++ b/scripts/build/cc_gcc.sh @@ -15,10 +15,8 @@ do_cc_get() { # Arrgghh! Some of those versions does not follow this convention: # gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a # subdirectory! You bastard! - CT_GetFile "${CT_CC_FILE}" \ - ftp://ftp.gnu.org/gnu/gcc/${CT_CC_FILE} \ - ftp://ftp.gnu.org/gnu/gcc/releases/${CT_CC_FILE} \ - ftp://ftp.gnu.org/gnu/gcc + CT_GetFile "${CT_CC_FILE}" \ + {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/${CT_CC_FILE}} } # Extract gcc diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 7140a0f..2c27398 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -15,11 +15,9 @@ do_debug_gdb_suffix() { } do_debug_gdb_get() { - CT_GetFile "gdb`do_debug_gdb_suffix`" \ - ftp://ftp.gnu.org/pub/gnu/gdb \ - ftp://sources.redhat.com/pub/gdb/releases \ - ftp://sources.redhat.com/pub/gdb/old-releases \ - ftp://sources.redhat.com/pub/gdb/snapshots/current + CT_GetFile "gdb`do_debug_gdb_suffix`" \ + {ftp,http}://ftp.gnu.org/pub/gnu/gdb \ + ftp://sources.redhat.com/pub/gdb/{{,old-}releases,snapshots/current} } do_debug_gdb_extract() { diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 3c85263..d64dc80 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -8,7 +8,7 @@ do_print_filename() { } do_debug_ltrace_get() { - CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" ftp://ftp.de.debian.org/debian/pool/main/l/ltrace/ + CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" {ftp,http}://ftp.de.debian.org/debian/pool/main/l/ltrace/ # Create a link so that the following steps are easier to do: cd "${CT_TARBALLS_DIR}" ltrace_ext=`CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig"` diff --git a/scripts/build/gmp.sh b/scripts/build/gmp.sh index 7cc2a85..ec99a2a 100644 --- a/scripts/build/gmp.sh +++ b/scripts/build/gmp.sh @@ -10,9 +10,7 @@ do_print_filename() { # Download GMP do_gmp_get() { - CT_GetFile "${CT_GMP_FILE}" \ - http://ftp.sunet.se/pub/gnu/gmp \ - ftp://ftp.gnu.org/gnu/gmp + CT_GetFile "${CT_GMP_FILE}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp } # Extract GMP diff --git a/scripts/build/kernel_linux.sh b/scripts/build/kernel_linux.sh index a272b1f..07005e0 100644 --- a/scripts/build/kernel_linux.sh +++ b/scripts/build/kernel_linux.sh @@ -13,11 +13,8 @@ do_print_filename() { # Download the kernel do_kernel_get() { if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then - CT_GetFile "${CT_KERNEL_FILE}" \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.4 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.2 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing \ + CT_GetFile "${CT_KERNEL_FILE}" \ + {ftp,http}://ftp.kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2} \ http://ep09.pld-linux.org/~mmazur/linux-libc-headers fi return 0 diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh index 0040a85..d607b3b 100644 --- a/scripts/build/libc_glibc.sh +++ b/scripts/build/libc_glibc.sh @@ -17,13 +17,13 @@ do_libc_get() { # Ah! Not all GNU folks seem stupid. All glibc releases are in the same # directory. Good. Alas, there is no snapshot there. I'll deal with them # later on... :-/ - CT_GetFile "${CT_LIBC_FILE}" ftp://ftp.gnu.org/gnu/glibc + CT_GetFile "${CT_LIBC_FILE}" {ftp,http}://ftp.gnu.org/gnu/glibc # C library addons for addon in `do_libc_add_ons_list " "`; do # NPTL addon is not to be downloaded, in any case [ "${addon}" = "nptl" ] && continue || true - CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ftp://ftp.gnu.org/gnu/glibc + CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" {ftp,http}://ftp.gnu.org/gnu/glibc done return 0 diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh index af06e3c..d4cb416 100644 --- a/scripts/build/libc_uClibc.sh +++ b/scripts/build/libc_uClibc.sh @@ -10,7 +10,7 @@ do_print_filename() { # Download uClibc do_libc_get() { - libc_src="http://www.uclibc.org/downloads + libc_src="http://www.uclibc.org/downloads http://www.uclibc.org/downloads/snapshots http://www.uclibc.org/downloads/old-releases" # For uClibc, we have almost every thing: releases, and snapshots |