1.1 --- a/config/global/download.in Wed Aug 03 00:00:44 2011 +0200
1.2 +++ b/config/global/download.in Tue Aug 02 23:10:37 2011 +0200
1.3 @@ -25,37 +25,6 @@
1.4
1.5 Useful if you suspect a tarball to be damaged.
1.6
1.7 -config USE_MIRROR
1.8 - bool
1.9 - prompt "Use a mirror"
1.10 - help
1.11 - If you have a machine on your LAN that mirrors some of the needed
1.12 - tarballs, you can say 'Y' here, and configure adequate values in
1.13 - the following options.
1.14 -
1.15 - Obviously, nothing prevents you from using a mirror that is in fact
1.16 - *not* on your LAN, for example on another subnet of your company's
1.17 - network, or a mirror on the Internet.
1.18 -
1.19 -config MIRROR_BASE_URL
1.20 - string
1.21 - prompt "Base URL"
1.22 - depends on USE_MIRROR
1.23 - default "http://ymorin.is-a-geek.org/mirrors/"
1.24 - help
1.25 - This is the base URL searched in for tarballs.
1.26 -
1.27 - I (Yann E. MORIN) have set up such a mirror to host snapshots of
1.28 - some components, when those snapshots are volatile on the upstream
1.29 - servers. The mirror is *slow*, because it is hosted behind an ADSL
1.30 - line. For the time being, I haven't set up bandwidth limitations,
1.31 - but should the mirror be abused, I will. Please avoid using my
1.32 - machine when you can... Also, no guarantee is made as to its
1.33 - availability. Use at your own risks.
1.34 -
1.35 - The mirror is available at:
1.36 - http://ymorin.is-a-geek.org/mirrors/
1.37 -
1.38 config CONNECT_TIMEOUT
1.39 int
1.40 prompt "Connection timeout"
1.41 @@ -87,3 +56,34 @@
1.42 Useful to pre-retrieve the tarballs before going off-line.
1.43
1.44 endif # ! FORBID_DOWNLOAD
1.45 +
1.46 +config USE_MIRROR
1.47 + bool
1.48 + prompt "Use a mirror"
1.49 + help
1.50 + If you have a machine on your LAN that mirrors some of the needed
1.51 + tarballs, you can say 'Y' here, and configure adequate values in
1.52 + the following options.
1.53 +
1.54 + Obviously, nothing prevents you from using a mirror that is in fact
1.55 + *not* on your LAN, for example on another subnet of your company's
1.56 + network, or a mirror on the Internet.
1.57 +
1.58 +config MIRROR_BASE_URL
1.59 + string
1.60 + prompt "Base URL"
1.61 + depends on USE_MIRROR
1.62 + default "http://ymorin.is-a-geek.org/mirrors/"
1.63 + help
1.64 + This is the base URL searched in for tarballs.
1.65 +
1.66 + I (Yann E. MORIN) have set up such a mirror to host snapshots of
1.67 + some components, when those snapshots are volatile on the upstream
1.68 + servers. The mirror is *slow*, because it is hosted behind an ADSL
1.69 + line. For the time being, I haven't set up bandwidth limitations,
1.70 + but should the mirror be abused, I will. Please avoid using my
1.71 + machine when you can... Also, no guarantee is made as to its
1.72 + availability. Use at your own risks.
1.73 +
1.74 + The mirror is available at:
1.75 + http://ymorin.is-a-geek.org/mirrors/
2.1 --- a/scripts/crosstool-NG.sh.in Wed Aug 03 00:00:44 2011 +0200
2.2 +++ b/scripts/crosstool-NG.sh.in Tue Aug 02 23:10:37 2011 +0200
2.3 @@ -509,27 +509,23 @@
2.4 fi
2.5
2.6 if [ -z "${CT_RESTART}" ]; then
2.7 - if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
2.8 - CT_DoLog INFO "Downloading forbidden by configuration, skipping downloads"
2.9 - else
2.10 - CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
2.11 - do_companion_tools_get
2.12 - do_kernel_get
2.13 - do_gmp_get
2.14 - do_mpfr_get
2.15 - do_ppl_get
2.16 - do_cloog_get
2.17 - do_mpc_get
2.18 - do_libelf_get
2.19 - do_binutils_get
2.20 - do_elf2flt_get
2.21 - do_sstrip_get
2.22 - do_cc_get
2.23 - do_libc_get
2.24 - do_debug_get
2.25 - do_test_suite_get
2.26 - CT_EndStep
2.27 - fi
2.28 + CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
2.29 + do_companion_tools_get
2.30 + do_kernel_get
2.31 + do_gmp_get
2.32 + do_mpfr_get
2.33 + do_ppl_get
2.34 + do_cloog_get
2.35 + do_mpc_get
2.36 + do_libelf_get
2.37 + do_binutils_get
2.38 + do_elf2flt_get
2.39 + do_sstrip_get
2.40 + do_cc_get
2.41 + do_libc_get
2.42 + do_debug_get
2.43 + do_test_suite_get
2.44 + CT_EndStep
2.45
2.46 if [ "${CT_ONLY_DOWNLOAD}" != "y" ]; then
2.47 if [ "${CT_FORCE_EXTRACT}" = "y" ]; then
3.1 --- a/scripts/functions Wed Aug 03 00:00:44 2011 +0200
3.2 +++ b/scripts/functions Tue Aug 02 23:10:37 2011 +0200
3.3 @@ -540,7 +540,9 @@
3.4 URLS+=( "${CT_MIRROR_BASE_URL}" )
3.5 fi
3.6
3.7 - URLS+=( "${@}" )
3.8 + if [ "${CT_FORBID_DOWNLOAD}" != "y" ]; then
3.9 + URLS+=( "${@}" )
3.10 + fi
3.11
3.12 # Scan all URLs in turn, and try to grab a tarball from there
3.13 # Do *not* try git trees (ext=/.git), this is handled in a specific
3.14 @@ -588,6 +590,11 @@
3.15 return 0
3.16 fi
3.17
3.18 + if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
3.19 + CT_DoLog WARN "Downloads forbidden, not trying cvs retrieval"
3.20 + return 1
3.21 + fi
3.22 +
3.23 CT_MktempDir tmp_dir
3.24 CT_Pushd "${tmp_dir}"
3.25
3.26 @@ -627,6 +634,11 @@
3.27 return 0
3.28 fi
3.29
3.30 + if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
3.31 + CT_DoLog WARN "Downloads forbidden, not trying svn retrieval"
3.32 + return 1
3.33 + fi
3.34 +
3.35 CT_MktempDir tmp_dir
3.36 CT_Pushd "${tmp_dir}"
3.37
3.38 @@ -652,6 +664,11 @@
3.39 local url
3.40 local cloned=0
3.41
3.42 + if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
3.43 + CT_DoLog WARN "Downloads forbidden, not trying git retrieval"
3.44 + return 1
3.45 + fi
3.46 +
3.47 # Do we have it in our tarballs dir?
3.48 if [ -d "${CT_TARBALLS_DIR}/${basename}/.git" ]; then
3.49 CT_DoLog EXTRA "Updating git tree '${basename}'"