From 539a2357df611b8b2035b033039e59563a771477 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 31 Aug 2009 22:55:26 +0200
Subject: [PATCH] config: move the patch choice to the extract section

Choosing the origin of the patches to apply is best
done in the 'extract' section.
---
 config/global/extract.in | 80 ++++++++++++++++++++++++++++++++++++++++
 config/global/paths.in   | 80 ----------------------------------------
 2 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/config/global/extract.in b/config/global/extract.in
index d7e9f346..3917fed5 100644
--- a/config/global/extract.in
+++ b/config/global/extract.in
@@ -40,3 +40,83 @@ config ONLY_EXTRACT
       Exit after unpacking and patching tarballs.
       
       Usefull to look at the code before doing the build itself.
+
+choice
+    prompt "Patches origin"
+    bool
+    default PATCH_BUNDLED
+
+config PATCH_BUNDLED
+    bool
+    prompt "Bundled only"
+    help
+      Only apply patches bundled with crosstool-NG.
+
+config PATCH_LOCAL
+    bool
+    prompt "Local only"
+    select PATCH_USE_LOCAL
+    help
+      Only apply your local patches.
+
+config PATCH_BUNDLED_LOCAL
+    bool
+    prompt "Bundled, then local"
+    select PATCH_USE_LOCAL
+    help
+      Apply the patches bundled with crosstool-NG,
+      then apply your local patches.
+
+config PATCH_LOCAL_BUNDLED
+    bool
+    prompt "Local, then bundled"
+    select PATCH_USE_LOCAL
+    help
+      Apply your local patches, then apply the patches
+      bundled with crosstool-NG.
+
+config PATCH_BUNDLED_FALLBACK_LOCAL
+    bool
+    prompt "Bundled only, local if no bundled"
+    select PATCH_USE_LOCAL
+    select PATCH_SINGLE
+    help
+      Apply the patches bundled with crosstool-NG;
+      if there's no bundled patches, apply your local patches.
+
+config PATCH_LOCAL_FALLBACK_BUNDLED
+    bool
+    prompt "Local only, bundled if no local"
+    select PATCH_USE_LOCAL
+    select PATCH_SINGLE
+    help
+      Only apply your local patches;
+      if there's no local patches, apply patches bundled with crosstool-NG.
+
+endchoice
+
+config PATCH_ORDER
+    string
+    default "bundled"           if PATCH_BUNDLED
+    default "local"             if PATCH_LOCAL
+    default "bundled,local"     if PATCH_BUNDLED_LOCAL
+    default "local,bundled"     if PATCH_LOCAL_BUNDLED
+
+config PATCH_SINGLE
+    bool
+    default n
+
+config PATCH_USE_LOCAL
+    bool
+    default n
+
+config LOCAL_PATCH_DIR
+    string
+    prompt "|  Local patch directory"
+    default ""
+    depends on PATCH_USE_LOCAL
+    help
+      Enter the custom patch directory here.
+      
+      Note that you must ensure that the directory contianing your custom
+      patches is arranged the same way the official directory is.
diff --git a/config/global/paths.in b/config/global/paths.in
index e277f046..7fc151b7 100644
--- a/config/global/paths.in
+++ b/config/global/paths.in
@@ -60,86 +60,6 @@ config INSTALL_DIR
 #      The reason you might also want to install elsewhere is if you are going
 #      to package your shinny new toolchain for distribution.
 
-choice
-    prompt "Patches origin"
-    bool
-    default PATCH_BUNDLED
-
-config PATCH_BUNDLED
-    bool
-    prompt "Bundled only"
-    help
-      Only apply patches bundled with crosstool-NG.
-
-config PATCH_LOCAL
-    bool
-    prompt "Local only"
-    select PATCH_USE_LOCAL
-    help
-      Only apply your local patches.
-
-config PATCH_BUNDLED_LOCAL
-    bool
-    prompt "Bundled, then local"
-    select PATCH_USE_LOCAL
-    help
-      Apply the patches bundled with crosstool-NG,
-      then apply your local patches.
-
-config PATCH_LOCAL_BUNDLED
-    bool
-    prompt "Local, then bundled"
-    select PATCH_USE_LOCAL
-    help
-      Apply your local patches, then apply the patches
-      bundled with crosstool-NG.
-
-config PATCH_BUNDLED_FALLBACK_LOCAL
-    bool
-    prompt "Bundled only, local if no bundled"
-    select PATCH_USE_LOCAL
-    select PATCH_SINGLE
-    help
-      Apply the patches bundled with crosstool-NG;
-      if there's no bundled patches, apply your local patches.
-
-config PATCH_LOCAL_FALLBACK_BUNDLED
-    bool
-    prompt "Local only, bundled if no local"
-    select PATCH_USE_LOCAL
-    select PATCH_SINGLE
-    help
-      Only apply your local patches;
-      if there's no local patches, apply patches bundled with crosstool-NG.
-
-endchoice
-
-config PATCH_ORDER
-    string
-    default "bundled"           if PATCH_BUNDLED
-    default "local"             if PATCH_LOCAL
-    default "bundled,local"     if PATCH_BUNDLED_LOCAL
-    default "local,bundled"     if PATCH_LOCAL_BUNDLED
-
-config PATCH_SINGLE
-    bool
-    default n
-
-config PATCH_USE_LOCAL
-    bool
-    default n
-
-config LOCAL_PATCH_DIR
-    string
-    prompt "|  Local patch directory"
-    default ""
-    depends on PATCH_USE_LOCAL
-    help
-      Enter the custom patch directory here.
-      
-      Note that you must ensure that the directory contianing your custom
-      patches is arranged the same way the official directory is.
-
 config REMOVE_DOCS
     bool
     prompt "Remove documentation"