From 49f53cc108100de4a696d64877979e27eaf2a28a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 19 Jul 2008 21:22:58 +0000 Subject: 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(-) diff --git a/config/global.in b/config/global.in index 82617a5..8b4219b 100644 --- a/config/global.in +++ b/config/global.in @@ -3,7 +3,8 @@ menu "Paths and misc options" source "config/global/ct-behave.in" -source "config/global/download_extract.in" +source "config/global/download.in" +source "config/global/extract.in" source "config/global/build-behave.in" source "config/global/paths.in" source "config/global/logging.in" diff --git a/config/global/download.in b/config/global/download.in new file mode 100644 index 0000000..a102295 --- /dev/null +++ b/config/global/download.in @@ -0,0 +1,183 @@ +# Options specific to downloading packages + +comment "Downloading" + +config FORCE_DOWNLOAD + bool + prompt "Force downloads" + default n + help + Force downloading tarballs, even if one already exists. + + Usefull if you suspect a tarball to be damaged. + +config ONLY_DOWNLOAD + bool + prompt "Stop after downloading tarballs" + default n + help + Only download the tarballs. Exit once it done. + + Usefull to pre-retrieve the tarballs before going off-line. + +config CONNECT_TIMEOUT + int + prompt "connection timeout" + default 10 + help + From the curl manual: + Maximum time in seconds that you allow the connection to the server to take. + + The scenario is as follows; + - some enterprise networks have firewalls that prohibit FTP traffic, while + still allowing HTTP + - most download sites have http:// equivalent for the ftp:// URL + - after this number of seconds, it is considered that the connection could + not be established, and the next URL in the list is tried, until we reach + an URL that will go through the firewall, most probably an http:// URL. + + If you have a slow network, you'd better set this value higher than the default + 10s. If you know a firewall is blocking connections, but your network is globally + fast, you can try to lower this value to jump more quickly to allowed URLs. YMMV. + + Note that this value applies equally to wget if you have that installed. + + Of course, you'd be better off to use a proxy, as offered by the following + choice of options. + +choice + bool + prompt "Proxy type" + default PROXY_TYPE_NONE + +config PROXY_TYPE_NONE + bool + prompt "No proxy" + help + Select this option if you have a direct connection to the internet, + or if you already set the environment adequately. + +config PROXY_TYPE_HTTP + bool + prompt "HTTP proxy" + help + Use an HTTP proxy to connect to to the internet. + Only the http and ftp protocols will be tunneled through this + proxy. + + Alternatively to setting this option, you can set and export the + following variables in your environment: + ftp_proxy=http://user:passwd@proxy.server:port/ + http_proxy=http://user:passwd@proxy.server:port/ + https_proxy=http://user:passwd@proxy.server:port/ + +# Haha! Here is an interesting feature/bug of mconf! +# The following config entries will be shown out-side the +# choice menu! +# To add a third entry in the choice menu, add it after the +# if...endif conditional below, and so on for a fourth entry... +if PROXY_TYPE_HTTP + +config PROXY_HOST + string + prompt "hostname/IP" + +config PROXY_PORT + int + prompt "port" + default 8080 + +config PROXY_USER + string + prompt "user name" + +config PROXY_PASS + string + prompt "password" + +endif # USE_HTTP_PROXY + +config PROXY_TYPE_SOCKS + bool + prompt "SOCKS 4/5 proxy (EXPERIMENTAL)" + depends on EXPERIMENTAL + help + Use a Socks 4/5 proxy to connect to the internet. + All protocols can get tunneled through this kind of proxy (depending + on your proxy configuration, some do not allow all protocols, but + chances are that protocols needed by crosstool-NG are allowed). + + Alternatively to setting this option, you can configure tsocks + system-wide, and set and export the following variable in your + environment: + LD_PRELOAD=/path/to/your/tsocks-library.so + + This option makes use of the tsocks library. You will have to have tsocks + installed on your system, of course. + + If you think you do not know what tsocks is, or how to configure it, + chances are that you do not need to set this option. + +if PROXY_TYPE_SOCKS + +choice + bool + prompt "type" + default PROXY_TYPE_SOCKS_SYS + +config PROXY_TYPE_SOCKS_SYS + bool + prompt "Use system settings" + help + Use that if tsocks is already configured on your system. + +config PROXY_TYPE_SOCKS_AUTO + bool + prompt "Auto" + help + crosstool-NG will attempt to guess what type of SOCKS version + the proxy speaks. + +config PROXY_TYPE_SOCKS_4 + bool + prompt "SOCKS 4" + +config PROXY_TYPE_SOCKS_5 + bool + prompt "SOCKS 5" + +endchoice + +if ! PROXY_TYPE_SOCKS_SYS + +config PROXY_HOST + string + prompt "hostname/IP" + +config PROXY_PORT + int + prompt "port" + default 1080 + +config PROXY_USER + string + prompt "user name" + +config PROXY_PASS + string + prompt "password" + +endif # ! PROXY_TYPE_SOCKS_SYS + +endif # USE_SOCKS_PROXY + +endchoice + +config PROXY_TYPE + string + default "none" if PROXY_TYPE_NONE + default "http" if PROXY_TYPE_HTTP + default "sockssys" if PROXY_TYPE_SOCKS_SYS + default "socksauto" if PROXY_TYPE_SOCKS_AUTO + default "socks4" if PROXY_TYPE_SOCKS_4 + default "socks5" if PROXY_TYPE_SOCKS_5 diff --git a/config/global/download_extract.in b/config/global/download_extract.in deleted file mode 100644 index 3a0db35..0000000 --- a/config/global/download_extract.in +++ /dev/null @@ -1,233 +0,0 @@ -# Options specific to downloading and extracting packages - -comment "Downloading" - -config FORCE_DOWNLOAD - bool - prompt "Force downloads" - default n - help - Force downloading tarballs, even if one already exists. - - Usefull if you suspect a tarball to be damaged. - -config ONLY_DOWNLOAD - bool - prompt "Stop after downloading tarballs" - default n - help - Only download the tarballs. Exit once it done. - - Usefull to pre-retrieve the tarballs before going off-line. - -config CONNECT_TIMEOUT - int - prompt "connection timeout" - default 10 - help - From the curl manual: - Maximum time in seconds that you allow the connection to the server to take. - - The scenario is as follows; - - some enterprise networks have firewalls that prohibit FTP traffic, while - still allowing HTTP - - most download sites have http:// equivalent for the ftp:// URL - - after this number of seconds, it is considered that the connection could - not be established, and the next URL in the list is tried, until we reach - an URL that will go through the firewall, most probably an http:// URL. - - If you have a slow network, you'd better set this value higher than the default - 10s. If you know a firewall is blocking connections, but your network is globally - fast, you can try to lower this value to jump more quickly to allowed URLs. YMMV. - - Note that this value applies equally to wget if you have that installed. - - Of course, you'd be better off to use a proxy, as offered by the following - choice of options. - -choice - bool - prompt "Proxy type" - default PROXY_TYPE_NONE - -config PROXY_TYPE_NONE - bool - prompt "No proxy" - help - Select this option if you have a direct connection to the internet, - or if you already set the environment adequately. - -config PROXY_TYPE_HTTP - bool - prompt "HTTP proxy" - help - Use an HTTP proxy to connect to to the internet. - Only the http and ftp protocols will be tunneled through this - proxy. - - Alternatively to setting this option, you can set and export the - following variables in your environment: - ftp_proxy=http://user:passwd@proxy.server:port/ - http_proxy=http://user:passwd@proxy.server:port/ - https_proxy=http://user:passwd@proxy.server:port/ - -# Haha! Here is an interesting feature/bug of mconf! -# The following config entries will be shown out-side the -# choice menu! -# To add a third entry in the choice menu, add it after the -# if...endif conditional below, and so on for a fourth entry... -if PROXY_TYPE_HTTP - -config PROXY_HOST - string - prompt "hostname/IP" - -config PROXY_PORT - int - prompt "port" - default 8080 - -config PROXY_USER - string - prompt "user name" - -config PROXY_PASS - string - prompt "password" - -endif # USE_HTTP_PROXY - -config PROXY_TYPE_SOCKS - bool - prompt "SOCKS 4/5 proxy (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - Use a Socks 4/5 proxy to connect to the internet. - All protocols can get tunneled through this kind of proxy (depending - on your proxy configuration, some do not allow all protocols, but - chances are that protocols needed by crosstool-NG are allowed). - - Alternatively to setting this option, you can configure tsocks - system-wide, and set and export the following variable in your - environment: - LD_PRELOAD=/path/to/your/tsocks-library.so - - This option makes use of the tsocks library. You will have to have tsocks - installed on your system, of course. - - If you think you do not know what tsocks is, or how to configure it, - chances are that you do not need to set this option. - -if PROXY_TYPE_SOCKS - -choice - bool - prompt "type" - default PROXY_TYPE_SOCKS_SYS - -config PROXY_TYPE_SOCKS_SYS - bool - prompt "Use system settings" - help - Use that if tsocks is already configured on your system. - -config PROXY_TYPE_SOCKS_AUTO - bool - prompt "Auto" - help - crosstool-NG will attempt to guess what type of SOCKS version - the proxy speaks. - -config PROXY_TYPE_SOCKS_4 - bool - prompt "SOCKS 4" - -config PROXY_TYPE_SOCKS_5 - bool - prompt "SOCKS 5" - -endchoice - -if ! PROXY_TYPE_SOCKS_SYS - -config PROXY_HOST - string - prompt "hostname/IP" - -config PROXY_PORT - int - prompt "port" - default 1080 - -config PROXY_USER - string - prompt "user name" - -config PROXY_PASS - string - prompt "password" - -endif # ! PROXY_TYPE_SOCKS_SYS - -endif # USE_SOCKS_PROXY - -endchoice - -config PROXY_TYPE - string - default "none" if PROXY_TYPE_NONE - default "http" if PROXY_TYPE_HTTP - default "sockssys" if PROXY_TYPE_SOCKS_SYS - default "socksauto" if PROXY_TYPE_SOCKS_AUTO - default "socks4" if PROXY_TYPE_SOCKS_4 - default "socks5" if PROXY_TYPE_SOCKS_5 - -# Force restore indentation -config BREAK_INDENT - bool - default n - -if ! ONLY_DOWNLOAD - -comment "Extracting" - -config FORCE_EXTRACT - bool - prompt "Force extractions" - default n - help - Force extraction of already exctracted tarballs. - - Usefull if you suspect a previous extract did not complete (eg. broken - tarball), or you added a new set of patches for this component. - -config OVERIDE_CONFIG_GUESS_SUB - bool - prompt "Override config.{guess,sub}" - default y - help - Override tools' versions of config.guess and config.sub with the ones - from crosstool-NG. This means that all instances of config.guess and - config.sub in gcc, binutils, glibc, etc... will be replaced. - - Most of the time, the versions of those scripts found in packages are old - versions, thus lacking some target definitions. This is the case for - uClibc-based tuples in old versions of gcc and gdb, for example. - - Also, doing so will guarantee that all components have the same tuples - definitions for your target, and not diverging ones. - - You can update the ones provided with crosstool-NG by first running: - ct-ng updatetools - in the directory where you want to run crosstool-NG prior to the build. - -config ONLY_EXTRACT - bool - prompt "Stop after extracting tarballs" - default n - help - Exit after unpacking and patching tarballs. - - Usefull to look at the code before doing the build itself. - -endif # ! ONLY_DOWNLOAD diff --git a/config/global/extract.in b/config/global/extract.in new file mode 100644 index 0000000..d7e9f34 --- /dev/null +++ b/config/global/extract.in @@ -0,0 +1,42 @@ +# Options specific to extracting packages + +comment "Extracting" + +config FORCE_EXTRACT + bool + prompt "Force extractions" + default n + help + Force extraction of already exctracted tarballs. + + Usefull if you suspect a previous extract did not complete (eg. broken + tarball), or you added a new set of patches for this component. + +config OVERIDE_CONFIG_GUESS_SUB + bool + prompt "Override config.{guess,sub}" + default y + help + Override tools' versions of config.guess and config.sub with the ones + from crosstool-NG. This means that all instances of config.guess and + config.sub in gcc, binutils, glibc, etc... will be replaced. + + Most of the time, the versions of those scripts found in packages are old + versions, thus lacking some target definitions. This is the case for + uClibc-based tuples in old versions of gcc and gdb, for example. + + Also, doing so will guarantee that all components have the same tuples + definitions for your target, and not diverging ones. + + You can update the ones provided with crosstool-NG by first running: + ct-ng updatetools + in the directory where you want to run crosstool-NG prior to the build. + +config ONLY_EXTRACT + bool + prompt "Stop after extracting tarballs" + default n + help + Exit after unpacking and patching tarballs. + + Usefull to look at the code before doing the build itself. -- cgit v0.10.2-6-g49f6