# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1178574331 0
# Node ID c77d59891a0d75e4960c60b51a8c6a71df427bf8
# Parent  312fe9ff8370f80777d10c409e195467291d0c15
Simplify kernel config file need.
Don't build a default config file when not needed.

diff -r 312fe9ff8370 -r c77d59891a0d config/kernel_linux.in
--- a/config/kernel_linux.in	Mon May 07 16:10:17 2007 +0000
+++ b/config/kernel_linux.in	Mon May 07 21:45:31 2007 +0000
@@ -15,15 +15,17 @@
     bool
     prompt "Mazur's sanitized headers (OBSOLETE)"
     depends on OBSOLETE
+    select KERNEL_LINUX_NEEDS_CONFIG
     help
       M. Mazur used to maintain a tree of sanitised headers, but it is now
-      obsoleted by the headers_install rule (above), and has not seen eny
+      obsoleted by the headers_install rule (above), and has not seen any
       update since 2.6.12
 
 config KERNEL_LINUX_HEADERS_COPY
     bool
     prompt "pure kernel headers (REALLY OBSOLETE)"
     depends on OBSOLETE
+    select KERNEL_LINUX_NEEDS_CONFIG
     help
       This will simply copy the kernel headers to the toolchain.
 
@@ -114,9 +116,14 @@
     default 1 if KERNEL_LINUX_VERBOSITY_1
     default 2 if KERNEL_LINUX_VERBOSITY_2
 
+config KERNEL_LINUX_NEEDS_CONFIG
+    bool
+    default n
+
 config KERNEL_LINUX_CONFIG_FILE
     string
     prompt "Configuration file"
+    depends on KERNEL_LINUX_NEEDS_CONFIG
     default ""
     help
       Path to a kernel configuration file.
diff -r 312fe9ff8370 -r c77d59891a0d scripts/build/kernel_linux.sh
--- a/scripts/build/kernel_linux.sh	Mon May 07 16:10:17 2007 +0000
+++ b/scripts/build/kernel_linux.sh	Mon May 07 21:45:31 2007 +0000
@@ -27,8 +27,13 @@
 do_kernel_check_config() {
     CT_DoStep INFO "Checking kernel configuration"
 
-    if [    "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" \
-         -a \( -z "${CT_KERNEL_LINUX_CONFIG_FILE}" -o ! -r "${CT_KERNEL_LINUX_CONFIG_FILE}" \) ]; then
+    # Only the copied or sanitised headers need a config file.
+    # Pre-existing headers as well as headers_install don't.
+    if [ "${CT_KERNEL_LINUX_NEEDS_CONFIG}" = "y"        \
+         -a \( -z "${CT_KERNEL_LINUX_CONFIG_FILE}"      \
+               -o ! -r "${CT_KERNEL_LINUX_CONFIG_FILE}" \
+            \)                                          \
+       ]; then
         CT_DoLog WARN "You did not provide a kernel configuration file!"
         CT_DoLog WARN "I will try to generate one for you, but beware!"