scripts: Update download locations

This change updates the download locations to default to the official
download site.

For gcc and gdb, also separate out the linaro download locations so that
if you are downloading the linaro variant, it skips trying to download
from the official gcc mirror.

This commit closes #3

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bryan Hundven 2014-12-08 15:03:08 -08:00
parent 098c87e98a
commit 79422633cf
17 changed files with 52 additions and 47 deletions

View File

@ -9,8 +9,8 @@ do_binutils_get() {
"${CT_BINUTILS_CUSTOM_LOCATION}" "${CT_BINUTILS_CUSTOM_LOCATION}"
else else
CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \
{ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ ftp://{sourceware.org,gcc.gnu.org}/pub/binutils/{releases,snapshots} \
ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils
fi fi
if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then

View File

@ -19,16 +19,17 @@ do_cc_get() {
|sed -r -e 's/-.*//;' \ |sed -r -e 's/-.*//;' \
)" )"
# Ah! gcc folks are kind of 'different': they store the tarballs in # The official gcc hosts put gcc under a gcc/release/ directory,
# subdirectories of the same name! # whereas the mirrors put it in the gcc/ directory.
# Arrgghh! Some of those versions does not follow this convention: # Also, Split out linaro mirrors, so that downloads happen faster.
# gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a if [ x"${linaro_version}" = x"" ]; then
# subdirectory! CT_GetFile "gcc-${CT_CC_VERSION}" \
ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION} \
{http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION} \
else
CT_GetFile "gcc-${CT_CC_VERSION}" \ CT_GetFile "gcc-${CT_CC_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}} \
ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${CT_CC_VERSION} \
ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION} \
"${linaro_base_url}/${linaro_series}/${linaro_version}/+download" "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
fi
fi # ! custom location fi # ! custom location
# Starting with GCC 4.3, ecj is used for Java, and will only be # Starting with GCC 4.3, ecj is used for Java, and will only be

View File

@ -12,7 +12,9 @@ if [ "${CT_GMP}" = "y" ]; then
# Download GMP # Download GMP
do_gmp_get() { do_gmp_get() {
CT_GetFile "gmp-${CT_GMP_VERSION}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp CT_GetFile "gmp-${CT_GMP_VERSION}" \
https://gmplib.org/download/gmp \
{http,ftp,https}://ftp.gnu.org/gnu/gmp
} }
# Extract GMP # Extract GMP

View File

@ -12,8 +12,9 @@ if [ "${CT_MPFR}" = "y" ]; then
# Download MPFR # Download MPFR
do_mpfr_get() { do_mpfr_get() {
CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/ \ CT_GetFile "mpfr-${CT_MPFR_VERSION}" \
http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/ http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} \
{http,ftp,https}://ftp.gnu.org/gnu/mpfr
} }
# Extract MPFR # Extract MPFR

View File

@ -13,7 +13,8 @@ if [ "${CT_PPL}" = "y" ]; then
# Download PPL # Download PPL
do_ppl_get() { do_ppl_get() {
CT_GetFile "ppl-${CT_PPL_VERSION}" \ CT_GetFile "ppl-${CT_PPL_VERSION}" \
http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION} http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION} \
ftp://ftp.cs.unipr.it/pub/ppl/releases/${CT_PPL_VERSION}
} }
# Extract PPL # Extract PPL

View File

@ -13,8 +13,7 @@ if [ "${CT_ISL}" = "y" ]; then
# Download ISL # Download ISL
do_isl_get() { do_isl_get() {
CT_GetFile "isl-${CT_ISL_VERSION}" \ CT_GetFile "isl-${CT_ISL_VERSION}" \
ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/ \ http://isl.gforge.inria.fr
http://mirrors.kernel.org/sources.redhat.com/gcc/infrastructure
} }
# Extract ISL # Extract ISL

View File

@ -24,8 +24,7 @@ if [ "${CT_CLOOG}" = "y" ]; then
# Download CLooG # Download CLooG
do_cloog_get() { do_cloog_get() {
CT_GetFile "$(cloog_basename_version)" \ CT_GetFile "$(cloog_basename_version)" \
http://www.bastoul.net/cloog/pages/download \ http://www.bastoul.net/cloog/pages/download
ftp://gcc.gnu.org/pub/gcc/infrastructure
} }
# Extract CLooG # Extract CLooG

View File

@ -13,7 +13,7 @@ if [ "${CT_MPC}" = "y" ]; then
# Download MPC # Download MPC
do_mpc_get() { do_mpc_get() {
CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz \ CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz \
http://www.multiprecision.org/mpc/download {http,ftp,https}://ftp.gnu.org/gnu/mpc
} }
# Extract MPC # Extract MPC

View File

@ -4,7 +4,7 @@ CT_MAKE_VERSION=3.81
do_companion_tools_make_get() { do_companion_tools_make_get() {
CT_GetFile "make-${CT_MAKE_VERSION}" \ CT_GetFile "make-${CT_MAKE_VERSION}" \
{http,ftp}://ftp.gnu.org/gnu/make {http,ftp,https}://ftp.gnu.org/gnu/make
} }
do_companion_tools_make_extract() { do_companion_tools_make_extract() {

View File

@ -4,7 +4,7 @@ CT_M4_VERSION=1.4.13
do_companion_tools_m4_get() { do_companion_tools_m4_get() {
CT_GetFile "m4-${CT_M4_VERSION}" \ CT_GetFile "m4-${CT_M4_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/m4 {http,ftp,https}://ftp.gnu.org/gnu/m4
} }
do_companion_tools_m4_extract() { do_companion_tools_m4_extract() {

View File

@ -4,7 +4,7 @@ CT_AUTOCONF_VERSION=2.65
do_companion_tools_autoconf_get() { do_companion_tools_autoconf_get() {
CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" \ CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/autoconf {http,ftp,https}://ftp.gnu.org/gnu/autoconf
} }
do_companion_tools_autoconf_extract() { do_companion_tools_autoconf_extract() {

View File

@ -4,7 +4,7 @@ CT_AUTOMAKE_VERSION=1.11.1
do_companion_tools_automake_get() { do_companion_tools_automake_get() {
CT_GetFile "automake-${CT_AUTOMAKE_VERSION}" \ CT_GetFile "automake-${CT_AUTOMAKE_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/automake {http,ftp,https}://ftp.gnu.org/gnu/automake
} }
do_companion_tools_automake_extract() { do_companion_tools_automake_extract() {

View File

@ -4,7 +4,7 @@ CT_LIBTOOL_VERSION=2.2.6b
do_companion_tools_libtool_get() { do_companion_tools_libtool_get() {
CT_GetFile "libtool-${CT_LIBTOOL_VERSION}" \ CT_GetFile "libtool-${CT_LIBTOOL_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/libtool {http,ftp,https}://ftp.gnu.org/gnu/libtool
} }
do_companion_tools_libtool_extract() { do_companion_tools_libtool_extract() {

View File

@ -50,17 +50,21 @@ do_debug_gdb_get() {
if [ "${need_gdb_src}" = "y" ]; then if [ "${need_gdb_src}" = "y" ]; then
if [ "${CT_GDB_CUSTOM}" = "y" ]; then if [ "${CT_GDB_CUSTOM}" = "y" ]; then
CT_GetCustom "gdb" "${CT_GDB_VERSION}" "${CT_GDB_CUSTOM_LOCATION}" CT_GetCustom "gdb" "${CT_GDB_VERSION}" "${CT_GDB_CUSTOM_LOCATION}"
else
if [ x"${linaro_release}" = x"" ]; then
CT_GetFile "gdb-${CT_GDB_VERSION}" \
ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases \
{http,ftp,https}://ftp.gnu.org/pub/gnu/gdb \
else else
CT_GetFile "gdb-${CT_GDB_VERSION}" \ CT_GetFile "gdb-${CT_GDB_VERSION}" \
{ftp,http}://ftp.gnu.org/pub/gnu/gdb \
ftp://sources.redhat.com/pub/gdb/{,old-}releases \
"${linaro_base_url}/${linaro_series}/${linaro_version}/+download" "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
fi fi
fi fi
fi
if [ "${need_ncurses_src}" = "y" ]; then if [ "${need_ncurses_src}" = "y" ]; then
CT_GetFile "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" .tar.gz \ CT_GetFile "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" .tar.gz \
{ftp,http}://ftp.gnu.org/pub/gnu/ncurses \ {http,ftp,https}://ftp.gnu.org/pub/gnu/ncurses \
ftp://invisible-island.net/ncurses ftp://invisible-island.net/ncurses
fi fi

View File

@ -2,7 +2,7 @@
do_debug_ltrace_get() { do_debug_ltrace_get() {
CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" .tar.gz \ CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" .tar.gz \
{ftp,http}://ftp.de.debian.org/debian/pool/main/l/ltrace/ {ftp,http}://ftp.debian.org/debian/pool/main/l/ltrace/
# Create a link so that the following steps are easier to do: # Create a link so that the following steps are easier to do:
CT_Pushd "${CT_TARBALLS_DIR}" CT_Pushd "${CT_TARBALLS_DIR}"
ltrace_ext=$(CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig") ltrace_ext=$(CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig")

View File

@ -49,7 +49,7 @@ do_kernel_get() {
2.6.*) rel_dir=v2.6;; 2.6.*) rel_dir=v2.6;;
3.*) rel_dir=v3.x;; 3.*) rel_dir=v3.x;;
esac esac
korg_base="http://ftp.kernel.org/pub/linux/kernel/${rel_dir}" korg_base="http://www.kernel.org/pub/linux/kernel/${rel_dir}"
CT_GetFile "linux-${CT_KERNEL_VERSION}" \ CT_GetFile "linux-${CT_KERNEL_VERSION}" \
"${korg_base}" \ "${korg_base}" \
"${korg_base}/longterm/v${k_ver}" \ "${korg_base}/longterm/v${k_ver}" \

View File

@ -20,9 +20,8 @@ do_libc_get() {
# Main source # Main source
CT_GetFile "glibc-${CT_LIBC_VERSION}" \ CT_GetFile "glibc-${CT_LIBC_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/glibc \ {http,ftp,https}://ftp.gnu.org/gnu/glibc \
ftp://gcc.gnu.org/pub/glibc/releases \ ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots}
ftp://gcc.gnu.org/pub/glibc/snapshots
# C library addons # C library addons
for addon in "${addons_list[@]}"; do for addon in "${addons_list[@]}"; do
@ -38,9 +37,8 @@ do_libc_get() {
esac esac
if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}" \ if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/glibc \ {http,ftp,https}://ftp.gnu.org/gnu/glibc \
ftp://gcc.gnu.org/pub/glibc/releases \ ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots}
ftp://gcc.gnu.org/pub/glibc/snapshots
then then
# Some add-ons are bundled with glibc, others are # Some add-ons are bundled with glibc, others are
# bundled in their own tarball. Eg. NPTL is internal, # bundled in their own tarball. Eg. NPTL is internal,