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(-)
1.1 --- a/config/kernel/linux.in Tue Mar 03 18:43:38 2009 +0000
1.2 +++ b/config/kernel/linux.in Tue Mar 03 20:29:35 2009 +0000
1.3 @@ -284,14 +284,14 @@
1.4
1.5 endif
1.6
1.7 -config KERNEL_LINUX_USE_CUSTOM_DIR
1.8 +config KERNEL_LINUX_USE_CUSTOM_HEADERS
1.9 bool
1.10 prompt "Use custom headers"
1.11 help
1.12 If you have some kernel headers lying around, you can enter the path
1.13 below.
1.14
1.15 -if KERNEL_LINUX_USE_CUSTOM_DIR
1.16 +if KERNEL_LINUX_USE_CUSTOM_HEADERS
1.17
1.18 config KERNEL_LINUX_CUSTOM_IS_TARBALL
1.19 bool
2.1 --- a/scripts/build/kernel/linux.sh Tue Mar 03 18:43:38 2009 +0000
2.2 +++ b/scripts/build/kernel/linux.sh Tue Mar 03 20:29:35 2009 +0000
2.3 @@ -9,7 +9,7 @@
2.4
2.5 # Download the kernel
2.6 do_kernel_get() {
2.7 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
2.8 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
2.9 CT_GetFile "linux-${CT_KERNEL_VERSION}" \
2.10 {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
2.11 fi
2.12 @@ -18,7 +18,7 @@
2.13
2.14 # Extract kernel
2.15 do_kernel_extract() {
2.16 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
2.17 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
2.18 CT_Extract "linux-${CT_KERNEL_VERSION}"
2.19 CT_Patch "linux-${CT_KERNEL_VERSION}"
2.20 fi
2.21 @@ -29,8 +29,8 @@
2.22 do_kernel_headers() {
2.23 CT_DoStep INFO "Installing kernel headers"
2.24
2.25 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" = "y" ]; then
2.26 - do_kernel_preinstalled
2.27 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
2.28 + do_kernel_custom
2.29 else
2.30 do_kernel_install
2.31 fi
2.32 @@ -74,10 +74,10 @@
2.33 fi
2.34 }
2.35
2.36 -# Use preinstalled headers (most probably by using make headers_install in a
2.37 +# Use custom headers (most probably by using make headers_install in a
2.38 # modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
2.39 # as 2.4). In this case, simply copy the headers in place
2.40 -do_kernel_preinstalled() {
2.41 +do_kernel_custom() {
2.42 local tar_opt
2.43
2.44 CT_DoLog EXTRA "Installing custom kernel headers"