Building packages using the new framework

(fails at building GMP off the VCS because it needs to run bootstrap scripts)

Signed-off-by: Alexey Neyman <stilor@att.net>

4 files changed, 31 insertions, 46 deletions

diff --git a/config/arch/xtensa.in b/config/arch/xtensa.in
index 3ffa4e80..c247f62a 100644
--- a/config/arch/xtensa.in
+++ b/config/arch/xtensa.in
@@ -5,6 +5,7 @@
 ## select ARCH_DEFAULT_LE
 ## select ARCH_SUPPORTS_BOTH_MMU
 ## select ARCH_DEFAULT_HAS_MMU
+## select USE_OVERLAY
 ##
 ## help The xtensa architecture
 ## help
diff --git a/config/arch/xtensa.in.2 b/config/arch/xtensa.in.2
index 25ece701..5ae14d2c 100644
--- a/config/arch/xtensa.in.2
+++ b/config/arch/xtensa.in.2
@@ -4,30 +4,9 @@ choice
 
 config XTENSA_CUSTOM
     bool "Custom Xtensa processor configuration"
+    select TARGET_USE_OVERLAY
 
 config ARCH_xtensa_fsf
     bool "fsf - Default configuration"
 
 endchoice
-
-config ARCH_XTENSA_CUSTOM_NAME
-    string "Custom Xtensa processor configuration name"
-    depends on XTENSA_CUSTOM
-    default ""
-    help
-      Enter the name of the custom processor configuration.
-      Overlay file for that configuration must be called
-      'xtensa_<CUSTOM_NAME>.tar'.
-
-      Leave blank to use the default 'xtensa-overlay.tar'.
-      For more information about this option, please also consult
-      section 'Using crosstool-NG to build Xtensa toolchains' in the
-      docs/C - Misc. tutorials.txt
-
-config ARCH_XTENSA_CUSTOM_OVERLAY_LOCATION
-    string "Full path to custom Xtensa processor configurations"
-    depends on XTENSA_CUSTOM
-    default ""
-    help
-      Enter the path to the directory for the custom processor
-      configuration file.
diff --git a/config/global/extract.in b/config/global/extract.in
index b7547757..582e69c2 100644
--- a/config/global/extract.in
+++ b/config/global/extract.in
@@ -73,24 +73,6 @@ config PATCH_LOCAL_BUNDLED
       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.
-
 config PATCH_NONE
     bool
     prompt "None"
@@ -110,19 +92,16 @@ config PATCH_ORDER
     string
     default "bundled"           if PATCH_BUNDLED
     default "local"             if PATCH_LOCAL
-    default "bundled,local"     if PATCH_BUNDLED_LOCAL || PATCH_BUNDLED_FALLBACK_LOCAL
-    default "local,bundled"     if PATCH_LOCAL_BUNDLED || PATCH_LOCAL_FALLBACK_BUNDLED
+    default "bundled,local"     if PATCH_BUNDLED_LOCAL
+    default "local,bundled"     if PATCH_LOCAL_BUNDLED
     default "none"              if PATCH_NONE
 
-config PATCH_SINGLE
-    bool
-
 config PATCH_USE_LOCAL
     bool
 
 config LOCAL_PATCH_DIR
     string
-    prompt "|  Local patch directory"
+    prompt "Local patch directory"
     default ""
     depends on PATCH_USE_LOCAL
     help
diff --git a/config/target.in b/config/target.in
index 3d86b557..1011ac92 100644
--- a/config/target.in
+++ b/config/target.in
@@ -404,4 +404,30 @@ config ARCH_FLOAT
 
 source "config/gen/arch.in.2"
 
+config TARGET_USE_OVERLAY
+    bool
+
+if TARGET_USE_OVERLAY
+
+config OVERLAY_NAME
+    string "Custom processor configuration name"
+    help
+      Enter the name of the custom processor configuration.
+      Overlay file for that configuration must be called
+      '<ARCH>_<OVERLAY_NAME>.tar' (optionally, with .gz/.bz2/.lzma/.xz
+      extension).
+
+      Leave blank to use the default '<ARCH>-overlay.tar'.
+      For more information about this option, please also consult the
+      section 'Using crosstool-NG to build Xtensa toolchains' in the
+      in http://crosstool-ng.github.io/docs/caveats-features/
+
+config OVERLAY_LOCATION
+    string "Full path to custom configuration (overlay)"
+    help
+      Enter the path to the directory for the custom processor
+      configuration file.
+
+endif
+
 endmenu