From ff0a1a3da605ca157e3f3d0ed2d8b9acb30c2f69 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Tue, 4 Jul 2017 19:19:42 -0700
Subject: Switch gen-kconfig to new framework

Also:
- Move companion_* to comp_* to match the kconfig symbols
- Replace bootstrap with former gen-versions.sh
- Fold *.in.2 into their respective first parts; this moves common
  options to the end - if it is undesirable, inclusion of *.in
  can be moved where *.in.2 used to be (but that will also move
  version selection after common options).
- Retire addToolVersion.sh (may later replace with a more
  comprehensive script that tries to download the added tarballs,
  copy the patches and try to apply them, and create a version.desc).

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/kernel/linux.in   | 41 ++++++++++++++++++++++++++++++++++++++++-
 config/kernel/linux.in.2 | 40 ----------------------------------------
 2 files changed, 40 insertions(+), 41 deletions(-)
 delete mode 100644 config/kernel/linux.in.2

(limited to 'config/kernel')

diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index e1edb489..52bc9d74 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -2,7 +2,7 @@
 
 ## depends on ! ARCH_avr
 ## select KERNEL_SUPPORTS_SHARED_LIBS
-##
+
 ## help Build a toolchain targeting systems running Linux as a kernel.
 
 # GLIBC and kernel are special when it comes to obsoletion. Users
@@ -13,3 +13,42 @@
 # Such pinned versions are indicated in version.desc files with a comment.
 
 source "config/versions/linux.in"
+
+choice
+    bool
+    prompt "Kernel verbosity:"
+    default KERNEL_LINUX_VERBOSITY_0
+
+config KERNEL_LINUX_VERBOSITY_0
+    bool
+    prompt "Simplified"
+    help
+      Print simplified command lines.
+
+config KERNEL_LINUX_VERBOSITY_1
+    bool
+    prompt "Full commands"
+    help
+      Print full command lines.
+
+config KERNEL_LINUX_VERBOSITY_2
+    bool
+    prompt "Exec reasons"
+    help
+      Print the reasons why a make target is rebuild.
+
+endchoice
+
+config KERNEL_LINUX_VERBOSE_LEVEL
+    int
+    default 0 if KERNEL_LINUX_VERBOSITY_0
+    default 1 if KERNEL_LINUX_VERBOSITY_1
+    default 2 if KERNEL_LINUX_VERBOSITY_2
+
+config KERNEL_LINUX_INSTALL_CHECK
+    bool
+    prompt "Check installed headers"
+    default y
+    help
+      If you are in doubt that installed headers are buggy, say 'Y'
+      here to have an extra check passed onto the headers.
diff --git a/config/kernel/linux.in.2 b/config/kernel/linux.in.2
deleted file mode 100644
index 80e13f37..00000000
--- a/config/kernel/linux.in.2
+++ /dev/null
@@ -1,40 +0,0 @@
-# Linux kernel options
-
-choice
-    bool
-    prompt "Kernel verbosity:"
-    default KERNEL_LINUX_VERBOSITY_0
-
-config KERNEL_LINUX_VERBOSITY_0
-    bool
-    prompt "Simplified"
-    help
-      Print simplified command lines.
-
-config KERNEL_LINUX_VERBOSITY_1
-    bool
-    prompt "Full commands"
-    help
-      Print full command lines.
-
-config KERNEL_LINUX_VERBOSITY_2
-    bool
-    prompt "Exec reasons"
-    help
-      Print the reasons why a make target is rebuild.
-
-endchoice
-
-config KERNEL_LINUX_VERBOSE_LEVEL
-    int
-    default 0 if KERNEL_LINUX_VERBOSITY_0
-    default 1 if KERNEL_LINUX_VERBOSITY_1
-    default 2 if KERNEL_LINUX_VERBOSITY_2
-
-config KERNEL_LINUX_INSTALL_CHECK
-    bool
-    prompt "Check installed headers"
-    default y
-    help
-      If you are in doubt that installed headers are buggy, say 'Y'
-      here to have an extra check passed onto the headers.
-- 
cgit v1.2.3