Merge pull request #288 from bhundven/custom_locations_rewrite

Custom locations rewrite

1 files changed, 30 insertions, 55 deletions

diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 3d919df..2669951 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -5,21 +5,38 @@
 ##
 ## help Build a toolchain targeting systems running Linux as a kernel.
 
-config KERNEL_LINUX_USE_CUSTOM_HEADERS
+config KERNEL_LINUX_CUSTOM
     bool
-    prompt "Use pre-installed headers tree (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "custom tarball or directory"
     help
-      If you have some pre-installed kernel headers lying around, you can
-      enter the path to these headers, below, they will be copied from
-      there, and into the toolchain's sysroot.
-      
-      Note:
-      This will *not* let you use a complete kernel tree!
-      If you want to use your own full kernel tree, then you want to say 'N'
-      here, and select KERNEL_LINUX_CUSTOM, in the versions list, below.
+      The choosen linux version shall be not downloaded. Instead use
+      a custom location to get the source.
 
-if ! KERNEL_LINUX_USE_CUSTOM_HEADERS
+if KERNEL_LINUX_CUSTOM
+
+config KERNEL_LINUX_CUSTOM_LOCATION
+    string
+    prompt "Path to custom source, tarball or directory"
+    help
+      Enter the path to the directory or tarball of your source for linux.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, linux, and the version is set
+      below in the custom version string.
+
+config KERNEL_LINUX_CUSTOM_VERSION
+    string
+    prompt "Custom Linux version"
+    help
+      Enter the version number for your custom linux.
+
+config KERNEL_VERSION
+    string
+    default KERNEL_LINUX_CUSTOM_VERSION
+
+endif # KERNEL_LINUX_CUSTOM
+
+if ! KERNEL_LINUX_CUSTOM
 
 choice
     bool
@@ -68,20 +85,6 @@ config KERNEL_V_2_6_32
     prompt "2.6.32.68"
     help
  
-config KERNEL_LINUX_CUSTOM
-    bool
-    prompt "custom tarball or directory"
-    help
-      Use a local tarball or local kernel directory of a complete kernel source tree.
-
-config KERNEL_LINUX_CUSTOM_LOCATION
-    string
-    prompt "Path to custom source, tarball or directory"
-    depends on KERNEL_LINUX_CUSTOM
-    help
-      Enter here the path to the tarball of your full kernel tree or
-      kernel directory
-
 endchoice
 
 config KERNEL_VERSION
@@ -98,33 +101,5 @@ config KERNEL_VERSION
     default "3.4.110" if KERNEL_V_3_4
     default "3.2.72" if KERNEL_V_3_2
     default "2.6.32.68" if KERNEL_V_2_6_32
-    default "custom" if KERNEL_LINUX_CUSTOM
-
-endif # ! KERNEL_LINUX_USE_CUSTOM_HEADERS
-
-if KERNEL_LINUX_USE_CUSTOM_HEADERS
-
-config KERNEL_LINUX_CUSTOM_PATH
-    string
-    prompt "Path to custom headers directory/tarball"
-    help
-      See KERNEL_LINUX_CUSTOM_IS_TARBALL, below.
 
-config KERNEL_LINUX_CUSTOM_IS_TARBALL
-    bool
-    prompt "This is a tarball"
-    help
-      If you say 'n' here, the path above is expected to point to a directory
-      containing readily prepared headers
-      
-      If you say 'y' here, then the path above is expected to point to a
-      tarball of such a directory.
-      
-      Eg., if your headers are available in: /foo/bar/buz/my_hdrs/include,
-      say 'n' here, and enter: /foo/bar/buz/my_hdrs below.
-      
-      Now, passing a tarball around is easier than passing a directory, so
-      if you want to, you can make a tarball of /foo/bar/buz/my_hdrs/include,
-      say 'y' here, and enter the path to this tarball below.
-
-endif # KERNEL_LINUX_USE_CUSTOM_HEADERS
+endif # ! KERNEL_LINUX_CUSTOM