1.1 --- a/config/global/download.in Tue Jan 06 22:34:36 2009 +0000
1.2 +++ b/config/global/download.in Sun May 03 09:50:16 2009 +0000
1.3 @@ -27,151 +27,6 @@
1.4
1.5 Usefull if you suspect a tarball to be damaged.
1.6
1.7 -menuconfig USE_PROXY
1.8 - bool
1.9 - prompt "Use a proxy"
1.10 - default n
1.11 - help
1.12 - Say 'Y' here if you need to use a proxy to connect to the internet.
1.13 -
1.14 - You can then choose between an HTTP or a SOCKS 4/5 proxy.
1.15 -
1.16 - **** NOTE ****
1.17 - The settings below may not cover all possible proxy configurations!
1.18 - You'd be better off setting proxy in the environment!
1.19 -
1.20 -if USE_PROXY
1.21 -
1.22 -choice
1.23 - bool
1.24 - prompt "Proxy type"
1.25 -
1.26 -config PROXY_TYPE_HTTP
1.27 - bool
1.28 - prompt "HTTP proxy"
1.29 - help
1.30 - Use an HTTP proxy to connect to to the internet.
1.31 - Only the http and ftp protocols will be tunneled through this
1.32 - proxy.
1.33 -
1.34 - Alternatively to setting this option, you can set and export the
1.35 - following variables in your environment:
1.36 - ftp_proxy=http://user:passwd@proxy.server:port/
1.37 - http_proxy=http://user:passwd@proxy.server:port/
1.38 - https_proxy=http://user:passwd@proxy.server:port/
1.39 -
1.40 -# Haha! Here is an interesting feature/bug of mconf!
1.41 -# The following config entries will be shown out-side the
1.42 -# choice menu!
1.43 -# To add a third entry in the choice menu, add it after the
1.44 -# if...endif conditional below, and so on for a fourth entry...
1.45 -if PROXY_TYPE_HTTP
1.46 -
1.47 -config PROXY_HOST
1.48 - string
1.49 - prompt "hostname/IP"
1.50 -
1.51 -config PROXY_PORT
1.52 - int
1.53 - prompt "port"
1.54 - default 8080
1.55 -
1.56 -config PROXY_USER
1.57 - string
1.58 - prompt "user name"
1.59 -
1.60 -config PROXY_PASS
1.61 - string
1.62 - prompt "password"
1.63 -
1.64 -endif # USE_HTTP_PROXY
1.65 -
1.66 -config PROXY_TYPE_SOCKS
1.67 - bool
1.68 - prompt "SOCKS 4/5 proxy"
1.69 - help
1.70 - Use a Socks 4/5 proxy to connect to the internet.
1.71 - All protocols can get tunneled through this kind of proxy (your
1.72 - proxy configuration may not allow all protocols, but chances are
1.73 - that protocols needed by crosstool-NG are allowed).
1.74 -
1.75 - Alternatively to setting this option, you can configure tsocks
1.76 - system-wide, and set and export the following variable in your
1.77 - environment:
1.78 - LD_PRELOAD=/path/to/your/tsocks-library.so
1.79 -
1.80 - This option makes use of the tsocks library. You will have to have tsocks
1.81 - installed on your system, of course.
1.82 -
1.83 - If you think you do not know what tsocks is, or how to configure it,
1.84 - chances are that you do not need to set this option.
1.85 -
1.86 -if PROXY_TYPE_SOCKS
1.87 -
1.88 -choice
1.89 - bool
1.90 - prompt "type"
1.91 - default PROXY_TYPE_SOCKS_SYS
1.92 -
1.93 -config PROXY_TYPE_SOCKS_SYS
1.94 - bool
1.95 - prompt "Use system settings"
1.96 - help
1.97 - Use that if tsocks is already configured on your system.
1.98 -
1.99 -config PROXY_TYPE_SOCKS_AUTO
1.100 - bool
1.101 - prompt "Auto"
1.102 - help
1.103 - crosstool-NG will attempt to guess what type of SOCKS version
1.104 - the proxy speaks.
1.105 -
1.106 -config PROXY_TYPE_SOCKS_4
1.107 - bool
1.108 - prompt "SOCKS 4"
1.109 -
1.110 -config PROXY_TYPE_SOCKS_5
1.111 - bool
1.112 - prompt "SOCKS 5"
1.113 -
1.114 -endchoice
1.115 -
1.116 -if ! PROXY_TYPE_SOCKS_SYS
1.117 -
1.118 -config PROXY_HOST
1.119 - string
1.120 - prompt "hostname/IP"
1.121 -
1.122 -config PROXY_PORT
1.123 - int
1.124 - prompt "port"
1.125 - default 1080
1.126 -
1.127 -config PROXY_USER
1.128 - string
1.129 - prompt "user name"
1.130 -
1.131 -config PROXY_PASS
1.132 - string
1.133 - prompt "password"
1.134 -
1.135 -endif # ! PROXY_TYPE_SOCKS_SYS
1.136 -
1.137 -endif # USE_SOCKS_PROXY
1.138 -
1.139 -endchoice
1.140 -
1.141 -endif # USE_PROXY
1.142 -
1.143 -config PROXY_TYPE
1.144 - string
1.145 - default "none" if ! USE_PROXY
1.146 - default "http" if PROXY_TYPE_HTTP
1.147 - default "sockssys" if PROXY_TYPE_SOCKS_SYS
1.148 - default "socksauto" if PROXY_TYPE_SOCKS_AUTO
1.149 - default "socks4" if PROXY_TYPE_SOCKS_4
1.150 - default "socks5" if PROXY_TYPE_SOCKS_5
1.151 -
1.152 menuconfig USE_MIRROR
1.153 bool
1.154 prompt "Use LAN mirror"
1.155 @@ -187,65 +42,33 @@
1.156 Obviously, nothing prevents you from using a mirror that is in fact
1.157 *not* on your LAN, for example on another subnet of your company's
1.158 network, or a mirror on the Internet.
1.159 +
1.160 +if USE_MIRROR
1.161 +
1.162 +config PREFER_MIRROR
1.163 + bool
1.164 + prompt "Prefer the mirror"
1.165 + default n
1.166 + help
1.167 + Say 'Y' here if you prefer the LAN miror over the upstream sources.
1.168 +
1.169 +config MIRROR_BASE_URL
1.170 + string
1.171 + prompt "Base URL"
1.172 + default "http://ymorin.is-a-geek.org/mirrors/"
1.173 + help
1.174 + This is the base URL searched in for tarballs.
1.175
1.176 I (Yann E. MORIN) have set up such a mirror to host snapshots of
1.177 some components, when those snapshots are volatile on the upstream
1.178 servers. The mirror is *slow*, because it is hosted behind an ADSL
1.179 line. For the time being, I haven't set up bandwidth limitations,
1.180 but should the mirror be abused, I will. Please avoid using my
1.181 - machine when you can...
1.182 - The mirror is available as (fill in those values in the fields
1.183 - below):
1.184 - host name: ymorin.is-a-geek.org
1.185 - base dir : /mirrors
1.186 -
1.187 -if USE_MIRROR
1.188 -
1.189 -config PREFER_MIRROR
1.190 - bool
1.191 - prompt "Prefer the LAN mirror"
1.192 - default n
1.193 - help
1.194 - Say 'Y' here if you prefer the LAN miror over the upstream sources.
1.195 -
1.196 -choice
1.197 - bool
1.198 - prompt "Server type:"
1.199 -
1.200 -config MIRROR_HTTP
1.201 - bool
1.202 - prompt "http"
1.203 -
1.204 -config MIRROR_FTP
1.205 - bool
1.206 - prompt "ftp"
1.207 -
1.208 -endchoice # Server type
1.209 -
1.210 -config MIRROR_SCHEME
1.211 - string
1.212 - default "http" if MIRROR_HTTP
1.213 - default "ftp" if MIRROR_FTP
1.214 -
1.215 -config MIRROR_HOSTNAME
1.216 - string
1.217 - prompt "hostname"
1.218 - default ""
1.219 - help
1.220 - Enter here the hostname on your LAN mirror.
1.221 -
1.222 -config MIRROR_BASE
1.223 - string
1.224 - prompt "Base directory"
1.225 - default ""
1.226 - help
1.227 - This is the base directory searched for for tarballs. If you enter
1.228 - /mirror, then the search is performed in the following directories
1.229 - on the server:
1.230 - /mirror/<name>/
1.231 - /mirror/
1.232 + machine when you can... Also, no guarantee is made as to its
1.233 + availability. Use at your own risks.
1.234
1.235 - where <name> is replaced with the actual package name.
1.236 + The mirror is available at:
1.237 + http://ymorin.is-a-geek.org/mirrors/
1.238
1.239 config MIRROR_LS_R
1.240 bool
1.241 @@ -285,9 +108,6 @@
1.242 fast, you can try to lower this value to jump more quickly to allowed URLs. YMMV.
1.243
1.244 Note that this value applies equally to wget if you have that installed.
1.245 -
1.246 - Of course, you'd be better off to use a proxy, as offered by the previous
1.247 - option.
1.248
1.249 config ONLY_DOWNLOAD
1.250 bool