1.1 --- a/config/global/download.in	Fri Oct 31 12:46:59 2008 +0000
     1.2 +++ b/config/global/download.in	Fri Oct 31 18:27:27 2008 +0000
     1.3 @@ -156,7 +156,7 @@
     1.4      default "socks4"    if PROXY_TYPE_SOCKS_4
     1.5      default "socks5"    if PROXY_TYPE_SOCKS_5
     1.6  
     1.7 -menuconfig USE_LAN_MIRROR
     1.8 +menuconfig USE_MIRROR
     1.9      bool
    1.10      prompt "Use LAN mirror"
    1.11      default n
    1.12 @@ -171,46 +171,54 @@
    1.13        Obviously, nothing prevents you from using a mirror that is in fact
    1.14        *not* on your LAN, for example on another subnet of your company's
    1.15        network, or a mirror on the Internet.
    1.16 +      
    1.17 +      I (Yann E. MORIN) have set up such a mirror to host snapshots of
    1.18 +      some components, when those snapshots are volatile on the upstream
    1.19 +      servers. The mirror is *slow*, because it is hosted behind an ADSL
    1.20 +      line. For the time being, I haven't set up bandwidth limitations,
    1.21 +      but should the mirror be abused, I will. Please avoid using my
    1.22 +      machine when you can...
    1.23 +      The mirror is available as (fill in those values in the fields
    1.24 +      below):
    1.25 +        host name: ymorin.is-a-geek.org
    1.26 +        base dir : /mirrors
    1.27  
    1.28 -if USE_LAN_MIRROR
    1.29 +if USE_MIRROR
    1.30  
    1.31 -config LAN_MIRROR_USE_PROXY
    1.32 +config PREFER_MIRROR
    1.33      bool
    1.34 -    prompt "Use the proxy"
    1.35 +    prompt "Prefer the LAN mirror"
    1.36      default n
    1.37 -    depends on USE_PROXY
    1.38      help
    1.39 -      Say 'Y' here if you need to use the proxy to connect to the LAN mirror.
    1.40 -      
    1.41 -      You'll need to say 'Y' if the LAN mirror is not really on your LAN.
    1.42 +      Say 'Y' here if you prefer the LAN miror over the upstream sources.
    1.43  
    1.44  choice
    1.45      bool
    1.46      prompt "Server type:"
    1.47  
    1.48 -config LAN_MIRROR_HTTP
    1.49 +config MIRROR_HTTP
    1.50      bool
    1.51      prompt "http"
    1.52  
    1.53 -config LAN_MIRROR_FTP
    1.54 +config MIRROR_FTP
    1.55      bool
    1.56      prompt "ftp"
    1.57  
    1.58  endchoice # Server type
    1.59  
    1.60 -config LAN_MIRROR_SCHEME
    1.61 +config MIRROR_SCHEME
    1.62      string
    1.63 -    default "http"  if LAN_MIRROR_HTTP
    1.64 -    default "ftp"   if LAN_MIRROR_FTP
    1.65 +    default "http"  if MIRROR_HTTP
    1.66 +    default "ftp"   if MIRROR_FTP
    1.67  
    1.68 -config LAN_MIRROR_HOSTNAME
    1.69 +config MIRROR_HOSTNAME
    1.70      string
    1.71      prompt "hostname"
    1.72      default ""
    1.73      help
    1.74        Enter here the hostname on your LAN mirror.
    1.75  
    1.76 -config LAN_MIRROR_BASE
    1.77 +config MIRROR_BASE
    1.78      string
    1.79      prompt "Base directory"
    1.80      default ""
    1.81 @@ -223,7 +231,7 @@
    1.82        
    1.83        where <name> is replaced with the actual package name.
    1.84  
    1.85 -config LAN_MIRROR_LS_R
    1.86 +config MIRROR_LS_R
    1.87      bool
    1.88  #    prompt "Use ls-lR et al."
    1.89      depends on EXPERIMENTAL
    1.90 @@ -238,7 +246,7 @@
    1.91          find.txt        (ditto)
    1.92          ls-lR
    1.93  
    1.94 -endif # USE_LAN_MIRROR
    1.95 +endif # USE_MIRROR
    1.96  
    1.97  config CONNECT_TIMEOUT
    1.98      int

     2.1 --- a/samples/alphaev56-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     2.2 +++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     2.3 @@ -33,7 +33,13 @@
     2.4  # CT_FORCE_DOWNLOAD is not set
     2.5  # CT_USE_PROXY is not set
     2.6  CT_PROXY_TYPE="none"
     2.7 -# CT_USE_LAN_MIRROR is not set
     2.8 +CT_USE_MIRROR=y
     2.9 +# CT_PREFER_MIRROR is not set
    2.10 +CT_MIRROR_HTTP=y
    2.11 +# CT_MIRROR_FTP is not set
    2.12 +CT_MIRROR_SCHEME="http"
    2.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    2.14 +CT_MIRROR_BASE="/mirrors"
    2.15  CT_CONNECT_TIMEOUT=10
    2.16  # CT_ONLY_DOWNLOAD is not set
    2.17  

     3.1 --- a/samples/arm-unknown-eabi/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     3.2 +++ b/samples/arm-unknown-eabi/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     3.3 @@ -33,7 +33,13 @@
     3.4  # CT_FORCE_DOWNLOAD is not set
     3.5  # CT_USE_PROXY is not set
     3.6  CT_PROXY_TYPE="none"
     3.7 -# CT_USE_LAN_MIRROR is not set
     3.8 +CT_USE_MIRROR=y
     3.9 +# CT_PREFER_MIRROR is not set
    3.10 +CT_MIRROR_HTTP=y
    3.11 +# CT_MIRROR_FTP is not set
    3.12 +CT_MIRROR_SCHEME="http"
    3.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    3.14 +CT_MIRROR_BASE="/mirrors"
    3.15  CT_CONNECT_TIMEOUT=10
    3.16  # CT_ONLY_DOWNLOAD is not set
    3.17  

     4.1 --- a/samples/arm-unknown-elf/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     4.2 +++ b/samples/arm-unknown-elf/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     4.3 @@ -33,7 +33,13 @@
     4.4  # CT_FORCE_DOWNLOAD is not set
     4.5  # CT_USE_PROXY is not set
     4.6  CT_PROXY_TYPE="none"
     4.7 -# CT_USE_LAN_MIRROR is not set
     4.8 +CT_USE_MIRROR=y
     4.9 +# CT_PREFER_MIRROR is not set
    4.10 +CT_MIRROR_HTTP=y
    4.11 +# CT_MIRROR_FTP is not set
    4.12 +CT_MIRROR_SCHEME="http"
    4.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    4.14 +CT_MIRROR_BASE="/mirrors"
    4.15  CT_CONNECT_TIMEOUT=10
    4.16  # CT_ONLY_DOWNLOAD is not set
    4.17  

     5.1 --- a/samples/arm-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     5.2 +++ b/samples/arm-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     5.3 @@ -33,7 +33,13 @@
     5.4  # CT_FORCE_DOWNLOAD is not set
     5.5  # CT_USE_PROXY is not set
     5.6  CT_PROXY_TYPE="none"
     5.7 -# CT_USE_LAN_MIRROR is not set
     5.8 +CT_USE_MIRROR=y
     5.9 +# CT_PREFER_MIRROR is not set
    5.10 +CT_MIRROR_HTTP=y
    5.11 +# CT_MIRROR_FTP is not set
    5.12 +CT_MIRROR_SCHEME="http"
    5.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    5.14 +CT_MIRROR_BASE="/mirrors"
    5.15  CT_CONNECT_TIMEOUT=10
    5.16  # CT_ONLY_DOWNLOAD is not set
    5.17  

     6.1 --- a/samples/arm-unknown-linux-gnueabi/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     6.2 +++ b/samples/arm-unknown-linux-gnueabi/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     6.3 @@ -33,7 +33,13 @@
     6.4  # CT_FORCE_DOWNLOAD is not set
     6.5  # CT_USE_PROXY is not set
     6.6  CT_PROXY_TYPE="none"
     6.7 -# CT_USE_LAN_MIRROR is not set
     6.8 +CT_USE_MIRROR=y
     6.9 +# CT_PREFER_MIRROR is not set
    6.10 +CT_MIRROR_HTTP=y
    6.11 +# CT_MIRROR_FTP is not set
    6.12 +CT_MIRROR_SCHEME="http"
    6.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    6.14 +CT_MIRROR_BASE="/mirrors"
    6.15  CT_CONNECT_TIMEOUT=10
    6.16  # CT_ONLY_DOWNLOAD is not set
    6.17  

     7.1 --- a/samples/arm-unknown-linux-uclibc/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     7.2 +++ b/samples/arm-unknown-linux-uclibc/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     7.3 @@ -33,7 +33,13 @@
     7.4  # CT_FORCE_DOWNLOAD is not set
     7.5  # CT_USE_PROXY is not set
     7.6  CT_PROXY_TYPE="none"
     7.7 -# CT_USE_LAN_MIRROR is not set
     7.8 +CT_USE_MIRROR=y
     7.9 +# CT_PREFER_MIRROR is not set
    7.10 +CT_MIRROR_HTTP=y
    7.11 +# CT_MIRROR_FTP is not set
    7.12 +CT_MIRROR_SCHEME="http"
    7.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    7.14 +CT_MIRROR_BASE="/mirrors"
    7.15  CT_CONNECT_TIMEOUT=10
    7.16  # CT_ONLY_DOWNLOAD is not set
    7.17  

     8.1 --- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     8.2 +++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     8.3 @@ -33,7 +33,13 @@
     8.4  # CT_FORCE_DOWNLOAD is not set
     8.5  # CT_USE_PROXY is not set
     8.6  CT_PROXY_TYPE="none"
     8.7 -# CT_USE_LAN_MIRROR is not set
     8.8 +CT_USE_MIRROR=y
     8.9 +# CT_PREFER_MIRROR is not set
    8.10 +CT_MIRROR_HTTP=y
    8.11 +# CT_MIRROR_FTP is not set
    8.12 +CT_MIRROR_SCHEME="http"
    8.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    8.14 +CT_MIRROR_BASE="/mirrors"
    8.15  CT_CONNECT_TIMEOUT=10
    8.16  # CT_ONLY_DOWNLOAD is not set
    8.17  

     9.1 --- a/samples/armeb-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
     9.2 +++ b/samples/armeb-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
     9.3 @@ -33,7 +33,13 @@
     9.4  # CT_FORCE_DOWNLOAD is not set
     9.5  # CT_USE_PROXY is not set
     9.6  CT_PROXY_TYPE="none"
     9.7 -# CT_USE_LAN_MIRROR is not set
     9.8 +CT_USE_MIRROR=y
     9.9 +# CT_PREFER_MIRROR is not set
    9.10 +CT_MIRROR_HTTP=y
    9.11 +# CT_MIRROR_FTP is not set
    9.12 +CT_MIRROR_SCHEME="http"
    9.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
    9.14 +CT_MIRROR_BASE="/mirrors"
    9.15  CT_CONNECT_TIMEOUT=10
    9.16  # CT_ONLY_DOWNLOAD is not set
    9.17  

    10.1 --- a/samples/armeb-unknown-linux-gnueabi/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    10.2 +++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    10.3 @@ -33,7 +33,13 @@
    10.4  # CT_FORCE_DOWNLOAD is not set
    10.5  # CT_USE_PROXY is not set
    10.6  CT_PROXY_TYPE="none"
    10.7 -# CT_USE_LAN_MIRROR is not set
    10.8 +CT_USE_MIRROR=y
    10.9 +# CT_PREFER_MIRROR is not set
   10.10 +CT_MIRROR_HTTP=y
   10.11 +# CT_MIRROR_FTP is not set
   10.12 +CT_MIRROR_SCHEME="http"
   10.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   10.14 +CT_MIRROR_BASE="/mirrors"
   10.15  CT_CONNECT_TIMEOUT=10
   10.16  # CT_ONLY_DOWNLOAD is not set
   10.17  

    11.1 --- a/samples/armeb-unknown-linux-uclibc/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    11.2 +++ b/samples/armeb-unknown-linux-uclibc/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    11.3 @@ -33,7 +33,13 @@
    11.4  # CT_FORCE_DOWNLOAD is not set
    11.5  # CT_USE_PROXY is not set
    11.6  CT_PROXY_TYPE="none"
    11.7 -# CT_USE_LAN_MIRROR is not set
    11.8 +CT_USE_MIRROR=y
    11.9 +# CT_PREFER_MIRROR is not set
   11.10 +CT_MIRROR_HTTP=y
   11.11 +# CT_MIRROR_FTP is not set
   11.12 +CT_MIRROR_SCHEME="http"
   11.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   11.14 +CT_MIRROR_BASE="/mirrors"
   11.15  CT_CONNECT_TIMEOUT=10
   11.16  # CT_ONLY_DOWNLOAD is not set
   11.17  

    12.1 --- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    12.2 +++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    12.3 @@ -33,7 +33,13 @@
    12.4  # CT_FORCE_DOWNLOAD is not set
    12.5  # CT_USE_PROXY is not set
    12.6  CT_PROXY_TYPE="none"
    12.7 -# CT_USE_LAN_MIRROR is not set
    12.8 +CT_USE_MIRROR=y
    12.9 +# CT_PREFER_MIRROR is not set
   12.10 +CT_MIRROR_HTTP=y
   12.11 +# CT_MIRROR_FTP is not set
   12.12 +CT_MIRROR_SCHEME="http"
   12.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   12.14 +CT_MIRROR_BASE="/mirrors"
   12.15  CT_CONNECT_TIMEOUT=10
   12.16  # CT_ONLY_DOWNLOAD is not set
   12.17  

    13.1 --- a/samples/i586-geode-linux-uclibc/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    13.2 +++ b/samples/i586-geode-linux-uclibc/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    13.3 @@ -33,7 +33,13 @@
    13.4  # CT_FORCE_DOWNLOAD is not set
    13.5  # CT_USE_PROXY is not set
    13.6  CT_PROXY_TYPE="none"
    13.7 -# CT_USE_LAN_MIRROR is not set
    13.8 +CT_USE_MIRROR=y
    13.9 +# CT_PREFER_MIRROR is not set
   13.10 +CT_MIRROR_HTTP=y
   13.11 +# CT_MIRROR_FTP is not set
   13.12 +CT_MIRROR_SCHEME="http"
   13.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   13.14 +CT_MIRROR_BASE="/mirrors"
   13.15  CT_CONNECT_TIMEOUT=10
   13.16  # CT_ONLY_DOWNLOAD is not set
   13.17  

    14.1 --- a/samples/i686-nptl-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    14.2 +++ b/samples/i686-nptl-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    14.3 @@ -33,7 +33,13 @@
    14.4  # CT_FORCE_DOWNLOAD is not set
    14.5  # CT_USE_PROXY is not set
    14.6  CT_PROXY_TYPE="none"
    14.7 -# CT_USE_LAN_MIRROR is not set
    14.8 +CT_USE_MIRROR=y
    14.9 +# CT_PREFER_MIRROR is not set
   14.10 +CT_MIRROR_HTTP=y
   14.11 +# CT_MIRROR_FTP is not set
   14.12 +CT_MIRROR_SCHEME="http"
   14.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   14.14 +CT_MIRROR_BASE="/mirrors"
   14.15  CT_CONNECT_TIMEOUT=10
   14.16  # CT_ONLY_DOWNLOAD is not set
   14.17  

    15.1 --- a/samples/ia64-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    15.2 +++ b/samples/ia64-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    15.3 @@ -33,7 +33,13 @@
    15.4  # CT_FORCE_DOWNLOAD is not set
    15.5  # CT_USE_PROXY is not set
    15.6  CT_PROXY_TYPE="none"
    15.7 -# CT_USE_LAN_MIRROR is not set
    15.8 +CT_USE_MIRROR=y
    15.9 +# CT_PREFER_MIRROR is not set
   15.10 +CT_MIRROR_HTTP=y
   15.11 +# CT_MIRROR_FTP is not set
   15.12 +CT_MIRROR_SCHEME="http"
   15.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   15.14 +CT_MIRROR_BASE="/mirrors"
   15.15  CT_CONNECT_TIMEOUT=10
   15.16  # CT_ONLY_DOWNLOAD is not set
   15.17  

    16.1 --- a/samples/mips-unknown-linux-uclibc/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    16.2 +++ b/samples/mips-unknown-linux-uclibc/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    16.3 @@ -33,7 +33,13 @@
    16.4  # CT_FORCE_DOWNLOAD is not set
    16.5  # CT_USE_PROXY is not set
    16.6  CT_PROXY_TYPE="none"
    16.7 -# CT_USE_LAN_MIRROR is not set
    16.8 +CT_USE_MIRROR=y
    16.9 +# CT_PREFER_MIRROR is not set
   16.10 +CT_MIRROR_HTTP=y
   16.11 +# CT_MIRROR_FTP is not set
   16.12 +CT_MIRROR_SCHEME="http"
   16.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   16.14 +CT_MIRROR_BASE="/mirrors"
   16.15  CT_CONNECT_TIMEOUT=10
   16.16  # CT_ONLY_DOWNLOAD is not set
   16.17  

    17.1 --- a/samples/mipsel-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    17.2 +++ b/samples/mipsel-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    17.3 @@ -33,7 +33,13 @@
    17.4  # CT_FORCE_DOWNLOAD is not set
    17.5  # CT_USE_PROXY is not set
    17.6  CT_PROXY_TYPE="none"
    17.7 -# CT_USE_LAN_MIRROR is not set
    17.8 +CT_USE_MIRROR=y
    17.9 +# CT_PREFER_MIRROR is not set
   17.10 +CT_MIRROR_HTTP=y
   17.11 +# CT_MIRROR_FTP is not set
   17.12 +CT_MIRROR_SCHEME="http"
   17.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   17.14 +CT_MIRROR_BASE="/mirrors"
   17.15  CT_CONNECT_TIMEOUT=10
   17.16  # CT_ONLY_DOWNLOAD is not set
   17.17  

    18.1 --- a/samples/powerpc-405-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    18.2 +++ b/samples/powerpc-405-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    18.3 @@ -33,7 +33,13 @@
    18.4  # CT_FORCE_DOWNLOAD is not set
    18.5  # CT_USE_PROXY is not set
    18.6  CT_PROXY_TYPE="none"
    18.7 -# CT_USE_LAN_MIRROR is not set
    18.8 +CT_USE_MIRROR=y
    18.9 +# CT_PREFER_MIRROR is not set
   18.10 +CT_MIRROR_HTTP=y
   18.11 +# CT_MIRROR_FTP is not set
   18.12 +CT_MIRROR_SCHEME="http"
   18.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   18.14 +CT_MIRROR_BASE="/mirrors"
   18.15  CT_CONNECT_TIMEOUT=10
   18.16  # CT_ONLY_DOWNLOAD is not set
   18.17  

    19.1 --- a/samples/powerpc-860-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    19.2 +++ b/samples/powerpc-860-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    19.3 @@ -36,7 +36,13 @@
    19.4  # CT_FORCE_DOWNLOAD is not set
    19.5  # CT_USE_PROXY is not set
    19.6  CT_PROXY_TYPE="none"
    19.7 -# CT_USE_LAN_MIRROR is not set
    19.8 +CT_USE_MIRROR=y
    19.9 +# CT_PREFER_MIRROR is not set
   19.10 +CT_MIRROR_HTTP=y
   19.11 +# CT_MIRROR_FTP is not set
   19.12 +CT_MIRROR_SCHEME="http"
   19.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   19.14 +CT_MIRROR_BASE="/mirrors"
   19.15  CT_CONNECT_TIMEOUT=10
   19.16  # CT_ONLY_DOWNLOAD is not set
   19.17  

    20.1 --- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    20.2 +++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    20.3 @@ -33,7 +33,13 @@
    20.4  # CT_FORCE_DOWNLOAD is not set
    20.5  # CT_USE_PROXY is not set
    20.6  CT_PROXY_TYPE="none"
    20.7 -# CT_USE_LAN_MIRROR is not set
    20.8 +CT_USE_MIRROR=y
    20.9 +# CT_PREFER_MIRROR is not set
   20.10 +CT_MIRROR_HTTP=y
   20.11 +# CT_MIRROR_FTP is not set
   20.12 +CT_MIRROR_SCHEME="http"
   20.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   20.14 +CT_MIRROR_BASE="/mirrors"
   20.15  CT_CONNECT_TIMEOUT=10
   20.16  # CT_ONLY_DOWNLOAD is not set
   20.17  

    21.1 --- a/samples/powerpc-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    21.2 +++ b/samples/powerpc-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    21.3 @@ -33,7 +33,13 @@
    21.4  # CT_FORCE_DOWNLOAD is not set
    21.5  # CT_USE_PROXY is not set
    21.6  CT_PROXY_TYPE="none"
    21.7 -# CT_USE_LAN_MIRROR is not set
    21.8 +CT_USE_MIRROR=y
    21.9 +# CT_PREFER_MIRROR is not set
   21.10 +CT_MIRROR_HTTP=y
   21.11 +# CT_MIRROR_FTP is not set
   21.12 +CT_MIRROR_SCHEME="http"
   21.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   21.14 +CT_MIRROR_BASE="/mirrors"
   21.15  CT_CONNECT_TIMEOUT=10
   21.16  # CT_ONLY_DOWNLOAD is not set
   21.17  

    22.1 --- a/samples/powerpc-unknown-linux-uclibc/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    22.2 +++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    22.3 @@ -33,7 +33,13 @@
    22.4  # CT_FORCE_DOWNLOAD is not set
    22.5  # CT_USE_PROXY is not set
    22.6  CT_PROXY_TYPE="none"
    22.7 -# CT_USE_LAN_MIRROR is not set
    22.8 +CT_USE_MIRROR=y
    22.9 +# CT_PREFER_MIRROR is not set
   22.10 +CT_MIRROR_HTTP=y
   22.11 +# CT_MIRROR_FTP is not set
   22.12 +CT_MIRROR_SCHEME="http"
   22.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   22.14 +CT_MIRROR_BASE="/mirrors"
   22.15  CT_CONNECT_TIMEOUT=10
   22.16  # CT_ONLY_DOWNLOAD is not set
   22.17  

    23.1 --- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    23.2 +++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    23.3 @@ -33,7 +33,13 @@
    23.4  # CT_FORCE_DOWNLOAD is not set
    23.5  # CT_USE_PROXY is not set
    23.6  CT_PROXY_TYPE="none"
    23.7 -# CT_USE_LAN_MIRROR is not set
    23.8 +CT_USE_MIRROR=y
    23.9 +# CT_PREFER_MIRROR is not set
   23.10 +CT_MIRROR_HTTP=y
   23.11 +# CT_MIRROR_FTP is not set
   23.12 +CT_MIRROR_SCHEME="http"
   23.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   23.14 +CT_MIRROR_BASE="/mirrors"
   23.15  CT_CONNECT_TIMEOUT=10
   23.16  # CT_ONLY_DOWNLOAD is not set
   23.17  

    24.1 --- a/samples/sh4-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    24.2 +++ b/samples/sh4-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    24.3 @@ -33,7 +33,13 @@
    24.4  # CT_FORCE_DOWNLOAD is not set
    24.5  # CT_USE_PROXY is not set
    24.6  CT_PROXY_TYPE="none"
    24.7 -# CT_USE_LAN_MIRROR is not set
    24.8 +CT_USE_MIRROR=y
    24.9 +# CT_PREFER_MIRROR is not set
   24.10 +CT_MIRROR_HTTP=y
   24.11 +# CT_MIRROR_FTP is not set
   24.12 +CT_MIRROR_SCHEME="http"
   24.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   24.14 +CT_MIRROR_BASE="/mirrors"
   24.15  CT_CONNECT_TIMEOUT=10
   24.16  # CT_ONLY_DOWNLOAD is not set
   24.17  

    25.1 --- a/samples/x86_64-unknown-linux-gnu/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    25.2 +++ b/samples/x86_64-unknown-linux-gnu/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    25.3 @@ -33,7 +33,13 @@
    25.4  # CT_FORCE_DOWNLOAD is not set
    25.5  # CT_USE_PROXY is not set
    25.6  CT_PROXY_TYPE="none"
    25.7 -# CT_USE_LAN_MIRROR is not set
    25.8 +CT_USE_MIRROR=y
    25.9 +# CT_PREFER_MIRROR is not set
   25.10 +CT_MIRROR_HTTP=y
   25.11 +# CT_MIRROR_FTP is not set
   25.12 +CT_MIRROR_SCHEME="http"
   25.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   25.14 +CT_MIRROR_BASE="/mirrors"
   25.15  CT_CONNECT_TIMEOUT=10
   25.16  # CT_ONLY_DOWNLOAD is not set
   25.17  

    26.1 --- a/samples/x86_64-unknown-linux-uclibc/crosstool.config	Fri Oct 31 12:46:59 2008 +0000
    26.2 +++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config	Fri Oct 31 18:27:27 2008 +0000
    26.3 @@ -33,7 +33,13 @@
    26.4  # CT_FORCE_DOWNLOAD is not set
    26.5  # CT_USE_PROXY is not set
    26.6  CT_PROXY_TYPE="none"
    26.7 -# CT_USE_LAN_MIRROR is not set
    26.8 +CT_USE_MIRROR=y
    26.9 +# CT_PREFER_MIRROR is not set
   26.10 +CT_MIRROR_HTTP=y
   26.11 +# CT_MIRROR_FTP is not set
   26.12 +CT_MIRROR_SCHEME="http"
   26.13 +CT_MIRROR_HOSTNAME="ymorin.is-a-geek.org"
   26.14 +CT_MIRROR_BASE="/mirrors"
   26.15  CT_CONNECT_TIMEOUT=10
   26.16  # CT_ONLY_DOWNLOAD is not set
   26.17  

    27.1 --- a/scripts/functions	Fri Oct 31 12:46:59 2008 +0000
    27.2 +++ b/scripts/functions	Fri Oct 31 18:27:27 2008 +0000
    27.3 @@ -474,40 +474,27 @@
    27.4  
    27.5      # Not found locally, try from the network
    27.6  
    27.7 -    # Start with LAN mirror
    27.8 -    if [ "${CT_USE_LAN_MIRROR}" = "y" ]; then
    27.9 -        CT_DoSetProxy ${CT_LAN_MIRROR_USE_PROXY:+${CT_PROXY_TYPE}}
   27.10 -        CT_DoLog DEBUG "Trying to retrieve a copy of '${file}' from LAN mirror '${CT_LAN_MIRROR_HOSTNAME}'"
   27.11 -        CT_TestOrAbort "Please set the LAN mirror hostname" -n "${CT_LAN_MIRROR_HOSTNAME}"
   27.12 -        CT_TestOrAbort "Please tell me where to find tarballs on the LAN mirror '${CT_LAN_MIRROR_HOSTNAME}'" -n "${CT_LAN_MIRROR_BASE}"
   27.13 -        for ext in ${first_ext} .tar.bz2 .tar.gz .tgz .tar ''; do
   27.14 -            # Please note: we just have the file's basename in a single piece.
   27.15 -            # So we have to just try and split it back into name and version... :-(
   27.16 -            for url in "${CT_LAN_MIRROR_SCHEME}://${CT_LAN_MIRROR_HOSTNAME}/${CT_LAN_MIRROR_BASE}/${file%-*}"  \
   27.17 -                       "${CT_LAN_MIRROR_SCHEME}://${CT_LAN_MIRROR_HOSTNAME}/${CT_LAN_MIRROR_BASE}";            \
   27.18 -            do
   27.19 -                CT_DoLog DEBUG "Trying '${url}/${file}${ext}'"
   27.20 -                CT_DoGetFile "${url}/${file}${ext}"
   27.21 -                if [ -f "${file}${ext}" ]; then
   27.22 -                    CT_DoLog DEBUG "Got '${file}' from the LAN mirror"
   27.23 -                    if [ "${CT_SAVE_TARBALLS}" = "y" ]; then
   27.24 -                        # The file may already exist if downloads are forced: remove it first
   27.25 -                        CT_DoLog EXTRA "Saving '${file}' to local storage"
   27.26 -                        CT_DoExecLog ALL rm -f "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}"
   27.27 -                        CT_DoExecLog ALL mv -f "${file}${ext}" "${CT_LOCAL_TARBALLS_DIR}"
   27.28 -                        CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}${ext}" "${file}${ext}"
   27.29 -                    fi
   27.30 -                    return 0
   27.31 -                fi
   27.32 -            done
   27.33 -        done
   27.34 +    # Add URLs on the LAN mirror
   27.35 +    LAN_URLS=
   27.36 +    if [ "${CT_USE_MIRROR}" = "y" ]; then
   27.37 +        CT_DoLog DEBUG "Trying to retrieve a copy of '${file}' from LAN mirror '${CT_MIRROR_HOSTNAME}'"
   27.38 +        CT_TestOrAbort "Please set the LAN mirror hostname" -n "${CT_MIRROR_HOSTNAME}"
   27.39 +        CT_TestOrAbort "Please tell me where to find tarballs on the LAN mirror '${CT_MIRROR_HOSTNAME}'" -n "${CT_MIRROR_BASE}"
   27.40 +        LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}/${file%-*}"
   27.41 +        LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}"
   27.42      fi
   27.43  
   27.44 -    # OK, available neither localy, nor from the LAN mirror (if any).
   27.45 +    if [ "${CT_PREFER_MIRROR}" = "y" ]; then
   27.46 +        URLS="${LAN_URLS} ${@}"
   27.47 +    else
   27.48 +        URLS="${@} ${LAN_URLS}"
   27.49 +    fi
   27.50 +
   27.51 +    # Scan all URLs in turn, and try to grab a tarball from there
   27.52      CT_DoSetProxy ${CT_PROXY_TYPE}
   27.53      for ext in ${first_ext} .tar.bz2 .tar.gz .tgz .tar ''; do
   27.54          # Try all urls in turn
   27.55 -        for url in "$@"; do
   27.56 +        for url in ${URLS}; do
   27.57              CT_DoLog DEBUG "Trying '${url}/${file}${ext}'"
   27.58              CT_DoGetFile "${url}/${file}${ext}"
   27.59              if [ -f "${file}${ext}" ]; then