# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1236112175 0
# Node ID c7558c696cc48d160142045f321e817dcbf122ed
# Parent  814d458b1878445485327e80708db4d7c0bab8b1
Rename the custom header option.

 /trunk/scripts/build/kernel/linux.sh |   12     6     6     0 ++++++------
 /trunk/config/kernel/linux.in        |    4     2     2     0 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff -r 814d458b1878 -r c7558c696cc4 config/kernel/linux.in
--- a/config/kernel/linux.in	Tue Mar 03 18:43:38 2009 +0000
+++ b/config/kernel/linux.in	Tue Mar 03 20:29:35 2009 +0000
@@ -284,14 +284,14 @@
 
 endif
 
-config KERNEL_LINUX_USE_CUSTOM_DIR
+config KERNEL_LINUX_USE_CUSTOM_HEADERS
     bool
     prompt "Use custom headers"
     help
       If you have some kernel headers lying around, you can enter the path
       below.
 
-if KERNEL_LINUX_USE_CUSTOM_DIR
+if KERNEL_LINUX_USE_CUSTOM_HEADERS
 
 config KERNEL_LINUX_CUSTOM_IS_TARBALL
     bool
diff -r 814d458b1878 -r c7558c696cc4 scripts/build/kernel/linux.sh
--- a/scripts/build/kernel/linux.sh	Tue Mar 03 18:43:38 2009 +0000
+++ b/scripts/build/kernel/linux.sh	Tue Mar 03 20:29:35 2009 +0000
@@ -9,7 +9,7 @@
 
 # Download the kernel
 do_kernel_get() {
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
         CT_GetFile "linux-${CT_KERNEL_VERSION}" \
                    {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
     fi
@@ -18,7 +18,7 @@
 
 # Extract kernel
 do_kernel_extract() {
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
         CT_Extract "linux-${CT_KERNEL_VERSION}"
         CT_Patch "linux-${CT_KERNEL_VERSION}"
     fi
@@ -29,8 +29,8 @@
 do_kernel_headers() {
     CT_DoStep INFO "Installing kernel headers"
 
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" = "y" ]; then
-        do_kernel_preinstalled
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
+        do_kernel_custom
     else
         do_kernel_install
     fi
@@ -74,10 +74,10 @@
     fi
 }
 
-# Use preinstalled headers (most probably by using make headers_install in a
+# Use custom headers (most probably by using make headers_install in a
 # modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
 # as 2.4). In this case, simply copy the headers in place
-do_kernel_preinstalled() {
+do_kernel_custom() {
     local tar_opt
 
     CT_DoLog EXTRA "Installing custom kernel headers"