Split-up download and extract options into two separate files, because download options are begining to be numerous.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jul 19 21:22:58 2008 +0000 (2008-07-19)
changeset 693458facedc485
parent 692 2a4a44be2d53
child 694 1026e9628e59
Split-up download and extract options into two separate files, because download options are begining to be numerous.

/trunk/config/global/extract.in | 193 1 192 0 ----------------------------------------------
/trunk/config/global/download.in | 52 1 51 0 ------------
/trunk/config/global.in | 3 2 1 0 +
3 files changed, 4 insertions(+), 244 deletions(-)
config/global.in
config/global/download.in
config/global/download_extract.in
config/global/extract.in
     1.1 --- a/config/global.in	Sat Jul 19 20:51:52 2008 +0000
     1.2 +++ b/config/global.in	Sat Jul 19 21:22:58 2008 +0000
     1.3 @@ -3,7 +3,8 @@
     1.4  menu "Paths and misc options"
     1.5  
     1.6  source "config/global/ct-behave.in"
     1.7 -source "config/global/download_extract.in"
     1.8 +source "config/global/download.in"
     1.9 +source "config/global/extract.in"
    1.10  source "config/global/build-behave.in"
    1.11  source "config/global/paths.in"
    1.12  source "config/global/logging.in"
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/config/global/download.in	Sat Jul 19 21:22:58 2008 +0000
     2.3 @@ -0,0 +1,183 @@
     2.4 +# Options specific to downloading packages
     2.5 +
     2.6 +comment "Downloading"
     2.7 +
     2.8 +config FORCE_DOWNLOAD
     2.9 +    bool
    2.10 +    prompt "Force downloads"
    2.11 +    default n
    2.12 +    help
    2.13 +      Force downloading tarballs, even if one already exists.
    2.14 +      
    2.15 +      Usefull if you suspect a tarball to be damaged.
    2.16 +
    2.17 +config ONLY_DOWNLOAD
    2.18 +    bool
    2.19 +    prompt "Stop after downloading tarballs"
    2.20 +    default n
    2.21 +    help
    2.22 +      Only download the tarballs. Exit once it done.
    2.23 +      
    2.24 +      Usefull to pre-retrieve the tarballs before going off-line.
    2.25 +
    2.26 +config CONNECT_TIMEOUT
    2.27 +    int
    2.28 +    prompt "connection timeout"
    2.29 +    default 10
    2.30 +    help
    2.31 +      From the curl manual:
    2.32 +        Maximum time in seconds that you allow the connection to the server to take.
    2.33 +
    2.34 +      The scenario is as follows;
    2.35 +        - some enterprise networks have firewalls that prohibit FTP traffic, while
    2.36 +          still allowing HTTP
    2.37 +        - most download sites have http:// equivalent for the ftp:// URL
    2.38 +        - after this number of seconds, it is considered that the connection could
    2.39 +          not be established, and the next URL in the list is tried, until we reach
    2.40 +          an URL that will go through the firewall, most probably an http:// URL.
    2.41 +
    2.42 +      If you have a slow network, you'd better set this value higher than the default
    2.43 +      10s. If you know a firewall is blocking connections, but your network is globally
    2.44 +      fast, you can try to lower this value to jump more quickly to allowed URLs. YMMV.
    2.45 +
    2.46 +      Note that this value applies equally to wget if you have that installed.
    2.47 +
    2.48 +      Of course, you'd be better off to use a proxy, as offered by the following
    2.49 +      choice of options.
    2.50 +
    2.51 +choice
    2.52 +    bool
    2.53 +    prompt "Proxy type"
    2.54 +    default PROXY_TYPE_NONE
    2.55 +
    2.56 +config PROXY_TYPE_NONE
    2.57 +    bool
    2.58 +    prompt "No proxy"
    2.59 +    help
    2.60 +      Select this option if you have a direct connection to the internet,
    2.61 +      or if you already set the environment adequately.
    2.62 +
    2.63 +config PROXY_TYPE_HTTP
    2.64 +    bool
    2.65 +    prompt "HTTP proxy"
    2.66 +    help
    2.67 +      Use an HTTP proxy to connect to to the internet.
    2.68 +      Only the http and ftp protocols will be tunneled through this
    2.69 +      proxy.
    2.70 +
    2.71 +      Alternatively to setting this option, you can set and export the
    2.72 +      following variables in your environment:
    2.73 +        ftp_proxy=http://user:passwd@proxy.server:port/
    2.74 +        http_proxy=http://user:passwd@proxy.server:port/
    2.75 +        https_proxy=http://user:passwd@proxy.server:port/
    2.76 +
    2.77 +# Haha! Here is an interesting feature/bug of mconf!
    2.78 +# The following config entries will be shown out-side the
    2.79 +# choice menu!
    2.80 +# To add a third entry in the choice menu, add it after the
    2.81 +# if...endif conditional below, and so on for a fourth entry...
    2.82 +if PROXY_TYPE_HTTP
    2.83 +
    2.84 +config PROXY_HOST
    2.85 +    string
    2.86 +    prompt "hostname/IP"
    2.87 +
    2.88 +config PROXY_PORT
    2.89 +    int
    2.90 +    prompt "port"
    2.91 +    default 8080
    2.92 +    
    2.93 +config PROXY_USER
    2.94 +    string
    2.95 +    prompt "user name"
    2.96 +
    2.97 +config PROXY_PASS
    2.98 +    string
    2.99 +    prompt "password"
   2.100 +
   2.101 +endif # USE_HTTP_PROXY
   2.102 +
   2.103 +config PROXY_TYPE_SOCKS
   2.104 +    bool
   2.105 +    prompt "SOCKS 4/5 proxy (EXPERIMENTAL)"
   2.106 +    depends on EXPERIMENTAL
   2.107 +    help
   2.108 +      Use a Socks 4/5 proxy to connect to the internet.
   2.109 +      All protocols can get tunneled through this kind of proxy (depending
   2.110 +      on your proxy configuration, some do not allow all protocols, but
   2.111 +      chances are that protocols needed by crosstool-NG are allowed).
   2.112 +
   2.113 +      Alternatively to setting this option, you can configure tsocks
   2.114 +      system-wide, and set and export the following variable in your
   2.115 +      environment:
   2.116 +        LD_PRELOAD=/path/to/your/tsocks-library.so
   2.117 +
   2.118 +      This option makes use of the tsocks library. You will have to have tsocks
   2.119 +      installed on your system, of course.
   2.120 +
   2.121 +      If you think you do not know what tsocks is, or how to configure it,
   2.122 +      chances are that you do not need to set this option.
   2.123 +
   2.124 +if PROXY_TYPE_SOCKS
   2.125 +
   2.126 +choice
   2.127 +    bool
   2.128 +    prompt "type"
   2.129 +    default PROXY_TYPE_SOCKS_SYS
   2.130 +
   2.131 +config PROXY_TYPE_SOCKS_SYS
   2.132 +    bool
   2.133 +    prompt "Use system settings"
   2.134 +    help
   2.135 +      Use that if tsocks is already configured on your system.
   2.136 +
   2.137 +config PROXY_TYPE_SOCKS_AUTO
   2.138 +    bool
   2.139 +    prompt "Auto"
   2.140 +    help
   2.141 +      crosstool-NG will attempt to guess what type of SOCKS version
   2.142 +      the proxy speaks.
   2.143 +
   2.144 +config PROXY_TYPE_SOCKS_4
   2.145 +    bool
   2.146 +    prompt "SOCKS 4"
   2.147 +
   2.148 +config PROXY_TYPE_SOCKS_5
   2.149 +    bool
   2.150 +    prompt "SOCKS 5"
   2.151 +
   2.152 +endchoice
   2.153 +
   2.154 +if ! PROXY_TYPE_SOCKS_SYS
   2.155 +
   2.156 +config PROXY_HOST
   2.157 +    string
   2.158 +    prompt "hostname/IP"
   2.159 +
   2.160 +config PROXY_PORT
   2.161 +    int
   2.162 +    prompt "port"
   2.163 +    default 1080
   2.164 +
   2.165 +config PROXY_USER
   2.166 +    string
   2.167 +    prompt "user name"
   2.168 +
   2.169 +config PROXY_PASS
   2.170 +    string
   2.171 +    prompt "password"
   2.172 +
   2.173 +endif # ! PROXY_TYPE_SOCKS_SYS
   2.174 +
   2.175 +endif # USE_SOCKS_PROXY
   2.176 +
   2.177 +endchoice
   2.178 +
   2.179 +config PROXY_TYPE
   2.180 +    string
   2.181 +    default "none"      if PROXY_TYPE_NONE
   2.182 +    default "http"      if PROXY_TYPE_HTTP
   2.183 +    default "sockssys"  if PROXY_TYPE_SOCKS_SYS
   2.184 +    default "socksauto" if PROXY_TYPE_SOCKS_AUTO
   2.185 +    default "socks4"    if PROXY_TYPE_SOCKS_4
   2.186 +    default "socks5"    if PROXY_TYPE_SOCKS_5
     3.1 --- a/config/global/download_extract.in	Sat Jul 19 20:51:52 2008 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,233 +0,0 @@
     3.4 -# Options specific to downloading and extracting packages
     3.5 -
     3.6 -comment "Downloading"
     3.7 -
     3.8 -config FORCE_DOWNLOAD
     3.9 -    bool
    3.10 -    prompt "Force downloads"
    3.11 -    default n
    3.12 -    help
    3.13 -      Force downloading tarballs, even if one already exists.
    3.14 -      
    3.15 -      Usefull if you suspect a tarball to be damaged.
    3.16 -
    3.17 -config ONLY_DOWNLOAD
    3.18 -    bool
    3.19 -    prompt "Stop after downloading tarballs"
    3.20 -    default n
    3.21 -    help
    3.22 -      Only download the tarballs. Exit once it done.
    3.23 -      
    3.24 -      Usefull to pre-retrieve the tarballs before going off-line.
    3.25 -
    3.26 -config CONNECT_TIMEOUT
    3.27 -    int
    3.28 -    prompt "connection timeout"
    3.29 -    default 10
    3.30 -    help
    3.31 -      From the curl manual:
    3.32 -        Maximum time in seconds that you allow the connection to the server to take.
    3.33 -
    3.34 -      The scenario is as follows;
    3.35 -        - some enterprise networks have firewalls that prohibit FTP traffic, while
    3.36 -          still allowing HTTP
    3.37 -        - most download sites have http:// equivalent for the ftp:// URL
    3.38 -        - after this number of seconds, it is considered that the connection could
    3.39 -          not be established, and the next URL in the list is tried, until we reach
    3.40 -          an URL that will go through the firewall, most probably an http:// URL.
    3.41 -
    3.42 -      If you have a slow network, you'd better set this value higher than the default
    3.43 -      10s. If you know a firewall is blocking connections, but your network is globally
    3.44 -      fast, you can try to lower this value to jump more quickly to allowed URLs. YMMV.
    3.45 -
    3.46 -      Note that this value applies equally to wget if you have that installed.
    3.47 -
    3.48 -      Of course, you'd be better off to use a proxy, as offered by the following
    3.49 -      choice of options.
    3.50 -
    3.51 -choice
    3.52 -    bool
    3.53 -    prompt "Proxy type"
    3.54 -    default PROXY_TYPE_NONE
    3.55 -
    3.56 -config PROXY_TYPE_NONE
    3.57 -    bool
    3.58 -    prompt "No proxy"
    3.59 -    help
    3.60 -      Select this option if you have a direct connection to the internet,
    3.61 -      or if you already set the environment adequately.
    3.62 -
    3.63 -config PROXY_TYPE_HTTP
    3.64 -    bool
    3.65 -    prompt "HTTP proxy"
    3.66 -    help
    3.67 -      Use an HTTP proxy to connect to to the internet.
    3.68 -      Only the http and ftp protocols will be tunneled through this
    3.69 -      proxy.
    3.70 -
    3.71 -      Alternatively to setting this option, you can set and export the
    3.72 -      following variables in your environment:
    3.73 -        ftp_proxy=http://user:passwd@proxy.server:port/
    3.74 -        http_proxy=http://user:passwd@proxy.server:port/
    3.75 -        https_proxy=http://user:passwd@proxy.server:port/
    3.76 -
    3.77 -# Haha! Here is an interesting feature/bug of mconf!
    3.78 -# The following config entries will be shown out-side the
    3.79 -# choice menu!
    3.80 -# To add a third entry in the choice menu, add it after the
    3.81 -# if...endif conditional below, and so on for a fourth entry...
    3.82 -if PROXY_TYPE_HTTP
    3.83 -
    3.84 -config PROXY_HOST
    3.85 -    string
    3.86 -    prompt "hostname/IP"
    3.87 -
    3.88 -config PROXY_PORT
    3.89 -    int
    3.90 -    prompt "port"
    3.91 -    default 8080
    3.92 -    
    3.93 -config PROXY_USER
    3.94 -    string
    3.95 -    prompt "user name"
    3.96 -
    3.97 -config PROXY_PASS
    3.98 -    string
    3.99 -    prompt "password"
   3.100 -
   3.101 -endif # USE_HTTP_PROXY
   3.102 -
   3.103 -config PROXY_TYPE_SOCKS
   3.104 -    bool
   3.105 -    prompt "SOCKS 4/5 proxy (EXPERIMENTAL)"
   3.106 -    depends on EXPERIMENTAL
   3.107 -    help
   3.108 -      Use a Socks 4/5 proxy to connect to the internet.
   3.109 -      All protocols can get tunneled through this kind of proxy (depending
   3.110 -      on your proxy configuration, some do not allow all protocols, but
   3.111 -      chances are that protocols needed by crosstool-NG are allowed).
   3.112 -
   3.113 -      Alternatively to setting this option, you can configure tsocks
   3.114 -      system-wide, and set and export the following variable in your
   3.115 -      environment:
   3.116 -        LD_PRELOAD=/path/to/your/tsocks-library.so
   3.117 -
   3.118 -      This option makes use of the tsocks library. You will have to have tsocks
   3.119 -      installed on your system, of course.
   3.120 -
   3.121 -      If you think you do not know what tsocks is, or how to configure it,
   3.122 -      chances are that you do not need to set this option.
   3.123 -
   3.124 -if PROXY_TYPE_SOCKS
   3.125 -
   3.126 -choice
   3.127 -    bool
   3.128 -    prompt "type"
   3.129 -    default PROXY_TYPE_SOCKS_SYS
   3.130 -
   3.131 -config PROXY_TYPE_SOCKS_SYS
   3.132 -    bool
   3.133 -    prompt "Use system settings"
   3.134 -    help
   3.135 -      Use that if tsocks is already configured on your system.
   3.136 -
   3.137 -config PROXY_TYPE_SOCKS_AUTO
   3.138 -    bool
   3.139 -    prompt "Auto"
   3.140 -    help
   3.141 -      crosstool-NG will attempt to guess what type of SOCKS version
   3.142 -      the proxy speaks.
   3.143 -
   3.144 -config PROXY_TYPE_SOCKS_4
   3.145 -    bool
   3.146 -    prompt "SOCKS 4"
   3.147 -
   3.148 -config PROXY_TYPE_SOCKS_5
   3.149 -    bool
   3.150 -    prompt "SOCKS 5"
   3.151 -
   3.152 -endchoice
   3.153 -
   3.154 -if ! PROXY_TYPE_SOCKS_SYS
   3.155 -
   3.156 -config PROXY_HOST
   3.157 -    string
   3.158 -    prompt "hostname/IP"
   3.159 -
   3.160 -config PROXY_PORT
   3.161 -    int
   3.162 -    prompt "port"
   3.163 -    default 1080
   3.164 -
   3.165 -config PROXY_USER
   3.166 -    string
   3.167 -    prompt "user name"
   3.168 -
   3.169 -config PROXY_PASS
   3.170 -    string
   3.171 -    prompt "password"
   3.172 -
   3.173 -endif # ! PROXY_TYPE_SOCKS_SYS
   3.174 -
   3.175 -endif # USE_SOCKS_PROXY
   3.176 -
   3.177 -endchoice
   3.178 -
   3.179 -config PROXY_TYPE
   3.180 -    string
   3.181 -    default "none"      if PROXY_TYPE_NONE
   3.182 -    default "http"      if PROXY_TYPE_HTTP
   3.183 -    default "sockssys"  if PROXY_TYPE_SOCKS_SYS
   3.184 -    default "socksauto" if PROXY_TYPE_SOCKS_AUTO
   3.185 -    default "socks4"    if PROXY_TYPE_SOCKS_4
   3.186 -    default "socks5"    if PROXY_TYPE_SOCKS_5
   3.187 -
   3.188 -# Force restore indentation
   3.189 -config BREAK_INDENT
   3.190 -    bool
   3.191 -    default n
   3.192 -
   3.193 -if ! ONLY_DOWNLOAD
   3.194 -
   3.195 -comment "Extracting"
   3.196 -
   3.197 -config FORCE_EXTRACT
   3.198 -    bool
   3.199 -    prompt "Force extractions"
   3.200 -    default n
   3.201 -    help
   3.202 -      Force extraction of already exctracted tarballs.
   3.203 -      
   3.204 -      Usefull if you suspect a previous extract did not complete (eg. broken
   3.205 -      tarball), or you added a new set of patches for this component.
   3.206 -
   3.207 -config OVERIDE_CONFIG_GUESS_SUB
   3.208 -    bool
   3.209 -    prompt "Override config.{guess,sub}"
   3.210 -    default y
   3.211 -    help
   3.212 -      Override tools' versions of config.guess and config.sub with the ones
   3.213 -      from crosstool-NG. This means that all instances of config.guess and
   3.214 -      config.sub in gcc, binutils, glibc, etc... will be replaced.
   3.215 -
   3.216 -      Most of the time, the versions of those scripts found in packages are old
   3.217 -      versions, thus lacking some target definitions. This is the case for
   3.218 -      uClibc-based tuples in old versions of gcc and gdb, for example.
   3.219 -
   3.220 -      Also, doing so will guarantee that all components have the same tuples
   3.221 -      definitions for your target, and not diverging ones.
   3.222 -
   3.223 -      You can update the ones provided with crosstool-NG by first running:
   3.224 -        ct-ng updatetools
   3.225 -      in the directory where you want to run crosstool-NG prior to the build.
   3.226 -
   3.227 -config ONLY_EXTRACT
   3.228 -    bool
   3.229 -    prompt "Stop after extracting tarballs"
   3.230 -    default n
   3.231 -    help
   3.232 -      Exit after unpacking and patching tarballs.
   3.233 -      
   3.234 -      Usefull to look at the code before doing the build itself.
   3.235 -
   3.236 -endif # ! ONLY_DOWNLOAD
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/config/global/extract.in	Sat Jul 19 21:22:58 2008 +0000
     4.3 @@ -0,0 +1,42 @@
     4.4 +# Options specific to extracting packages
     4.5 +
     4.6 +comment "Extracting"
     4.7 +
     4.8 +config FORCE_EXTRACT
     4.9 +    bool
    4.10 +    prompt "Force extractions"
    4.11 +    default n
    4.12 +    help
    4.13 +      Force extraction of already exctracted tarballs.
    4.14 +      
    4.15 +      Usefull if you suspect a previous extract did not complete (eg. broken
    4.16 +      tarball), or you added a new set of patches for this component.
    4.17 +
    4.18 +config OVERIDE_CONFIG_GUESS_SUB
    4.19 +    bool
    4.20 +    prompt "Override config.{guess,sub}"
    4.21 +    default y
    4.22 +    help
    4.23 +      Override tools' versions of config.guess and config.sub with the ones
    4.24 +      from crosstool-NG. This means that all instances of config.guess and
    4.25 +      config.sub in gcc, binutils, glibc, etc... will be replaced.
    4.26 +
    4.27 +      Most of the time, the versions of those scripts found in packages are old
    4.28 +      versions, thus lacking some target definitions. This is the case for
    4.29 +      uClibc-based tuples in old versions of gcc and gdb, for example.
    4.30 +
    4.31 +      Also, doing so will guarantee that all components have the same tuples
    4.32 +      definitions for your target, and not diverging ones.
    4.33 +
    4.34 +      You can update the ones provided with crosstool-NG by first running:
    4.35 +        ct-ng updatetools
    4.36 +      in the directory where you want to run crosstool-NG prior to the build.
    4.37 +
    4.38 +config ONLY_EXTRACT
    4.39 +    bool
    4.40 +    prompt "Stop after extracting tarballs"
    4.41 +    default n
    4.42 +    help
    4.43 +      Exit after unpacking and patching tarballs.
    4.44 +      
    4.45 +      Usefull to look at the code before doing the build itself.