1.1 --- a/config/global/extract.in	Mon Aug 31 12:47:58 2009 +0200
     1.2 +++ b/config/global/extract.in	Mon Aug 31 22:55:26 2009 +0200
     1.3 @@ -40,3 +40,83 @@
     1.4        Exit after unpacking and patching tarballs.
     1.5        
     1.6        Usefull to look at the code before doing the build itself.
     1.7 +
     1.8 +choice
     1.9 +    prompt "Patches origin"
    1.10 +    bool
    1.11 +    default PATCH_BUNDLED
    1.12 +
    1.13 +config PATCH_BUNDLED
    1.14 +    bool
    1.15 +    prompt "Bundled only"
    1.16 +    help
    1.17 +      Only apply patches bundled with crosstool-NG.
    1.18 +
    1.19 +config PATCH_LOCAL
    1.20 +    bool
    1.21 +    prompt "Local only"
    1.22 +    select PATCH_USE_LOCAL
    1.23 +    help
    1.24 +      Only apply your local patches.
    1.25 +
    1.26 +config PATCH_BUNDLED_LOCAL
    1.27 +    bool
    1.28 +    prompt "Bundled, then local"
    1.29 +    select PATCH_USE_LOCAL
    1.30 +    help
    1.31 +      Apply the patches bundled with crosstool-NG,
    1.32 +      then apply your local patches.
    1.33 +
    1.34 +config PATCH_LOCAL_BUNDLED
    1.35 +    bool
    1.36 +    prompt "Local, then bundled"
    1.37 +    select PATCH_USE_LOCAL
    1.38 +    help
    1.39 +      Apply your local patches, then apply the patches
    1.40 +      bundled with crosstool-NG.
    1.41 +
    1.42 +config PATCH_BUNDLED_FALLBACK_LOCAL
    1.43 +    bool
    1.44 +    prompt "Bundled only, local if no bundled"
    1.45 +    select PATCH_USE_LOCAL
    1.46 +    select PATCH_SINGLE
    1.47 +    help
    1.48 +      Apply the patches bundled with crosstool-NG;
    1.49 +      if there's no bundled patches, apply your local patches.
    1.50 +
    1.51 +config PATCH_LOCAL_FALLBACK_BUNDLED
    1.52 +    bool
    1.53 +    prompt "Local only, bundled if no local"
    1.54 +    select PATCH_USE_LOCAL
    1.55 +    select PATCH_SINGLE
    1.56 +    help
    1.57 +      Only apply your local patches;
    1.58 +      if there's no local patches, apply patches bundled with crosstool-NG.
    1.59 +
    1.60 +endchoice
    1.61 +
    1.62 +config PATCH_ORDER
    1.63 +    string
    1.64 +    default "bundled"           if PATCH_BUNDLED
    1.65 +    default "local"             if PATCH_LOCAL
    1.66 +    default "bundled,local"     if PATCH_BUNDLED_LOCAL
    1.67 +    default "local,bundled"     if PATCH_LOCAL_BUNDLED
    1.68 +
    1.69 +config PATCH_SINGLE
    1.70 +    bool
    1.71 +    default n
    1.72 +
    1.73 +config PATCH_USE_LOCAL
    1.74 +    bool
    1.75 +    default n
    1.76 +
    1.77 +config LOCAL_PATCH_DIR
    1.78 +    string
    1.79 +    prompt "|  Local patch directory"
    1.80 +    default ""
    1.81 +    depends on PATCH_USE_LOCAL
    1.82 +    help
    1.83 +      Enter the custom patch directory here.
    1.84 +      
    1.85 +      Note that you must ensure that the directory contianing your custom
    1.86 +      patches is arranged the same way the official directory is.

     2.1 --- a/config/global/paths.in	Mon Aug 31 12:47:58 2009 +0200
     2.2 +++ b/config/global/paths.in	Mon Aug 31 22:55:26 2009 +0200
     2.3 @@ -60,86 +60,6 @@
     2.4  #      The reason you might also want to install elsewhere is if you are going
     2.5  #      to package your shinny new toolchain for distribution.
     2.6  
     2.7 -choice
     2.8 -    prompt "Patches origin"
     2.9 -    bool
    2.10 -    default PATCH_BUNDLED
    2.11 -
    2.12 -config PATCH_BUNDLED
    2.13 -    bool
    2.14 -    prompt "Bundled only"
    2.15 -    help
    2.16 -      Only apply patches bundled with crosstool-NG.
    2.17 -
    2.18 -config PATCH_LOCAL
    2.19 -    bool
    2.20 -    prompt "Local only"
    2.21 -    select PATCH_USE_LOCAL
    2.22 -    help
    2.23 -      Only apply your local patches.
    2.24 -
    2.25 -config PATCH_BUNDLED_LOCAL
    2.26 -    bool
    2.27 -    prompt "Bundled, then local"
    2.28 -    select PATCH_USE_LOCAL
    2.29 -    help
    2.30 -      Apply the patches bundled with crosstool-NG,
    2.31 -      then apply your local patches.
    2.32 -
    2.33 -config PATCH_LOCAL_BUNDLED
    2.34 -    bool
    2.35 -    prompt "Local, then bundled"
    2.36 -    select PATCH_USE_LOCAL
    2.37 -    help
    2.38 -      Apply your local patches, then apply the patches
    2.39 -      bundled with crosstool-NG.
    2.40 -
    2.41 -config PATCH_BUNDLED_FALLBACK_LOCAL
    2.42 -    bool
    2.43 -    prompt "Bundled only, local if no bundled"
    2.44 -    select PATCH_USE_LOCAL
    2.45 -    select PATCH_SINGLE
    2.46 -    help
    2.47 -      Apply the patches bundled with crosstool-NG;
    2.48 -      if there's no bundled patches, apply your local patches.
    2.49 -
    2.50 -config PATCH_LOCAL_FALLBACK_BUNDLED
    2.51 -    bool
    2.52 -    prompt "Local only, bundled if no local"
    2.53 -    select PATCH_USE_LOCAL
    2.54 -    select PATCH_SINGLE
    2.55 -    help
    2.56 -      Only apply your local patches;
    2.57 -      if there's no local patches, apply patches bundled with crosstool-NG.
    2.58 -
    2.59 -endchoice
    2.60 -
    2.61 -config PATCH_ORDER
    2.62 -    string
    2.63 -    default "bundled"           if PATCH_BUNDLED
    2.64 -    default "local"             if PATCH_LOCAL
    2.65 -    default "bundled,local"     if PATCH_BUNDLED_LOCAL
    2.66 -    default "local,bundled"     if PATCH_LOCAL_BUNDLED
    2.67 -
    2.68 -config PATCH_SINGLE
    2.69 -    bool
    2.70 -    default n
    2.71 -
    2.72 -config PATCH_USE_LOCAL
    2.73 -    bool
    2.74 -    default n
    2.75 -
    2.76 -config LOCAL_PATCH_DIR
    2.77 -    string
    2.78 -    prompt "|  Local patch directory"
    2.79 -    default ""
    2.80 -    depends on PATCH_USE_LOCAL
    2.81 -    help
    2.82 -      Enter the custom patch directory here.
    2.83 -      
    2.84 -      Note that you must ensure that the directory contianing your custom
    2.85 -      patches is arranged the same way the official directory is.
    2.86 -
    2.87  config REMOVE_DOCS
    2.88      bool
    2.89      prompt "Remove documentation"