1.1 --- a/scripts/build/kernel/linux.sh Tue Mar 03 18:43:38 2009 +0000
1.2 +++ b/scripts/build/kernel/linux.sh Sun Mar 08 22:13:27 2009 +0000
1.3 @@ -9,7 +9,7 @@
1.4
1.5 # Download the kernel
1.6 do_kernel_get() {
1.7 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
1.8 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
1.9 CT_GetFile "linux-${CT_KERNEL_VERSION}" \
1.10 {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
1.11 fi
1.12 @@ -18,7 +18,7 @@
1.13
1.14 # Extract kernel
1.15 do_kernel_extract() {
1.16 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
1.17 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
1.18 CT_Extract "linux-${CT_KERNEL_VERSION}"
1.19 CT_Patch "linux-${CT_KERNEL_VERSION}"
1.20 fi
1.21 @@ -29,8 +29,8 @@
1.22 do_kernel_headers() {
1.23 CT_DoStep INFO "Installing kernel headers"
1.24
1.25 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" = "y" ]; then
1.26 - do_kernel_preinstalled
1.27 + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
1.28 + do_kernel_custom
1.29 else
1.30 do_kernel_install
1.31 fi
1.32 @@ -74,10 +74,10 @@
1.33 fi
1.34 }
1.35
1.36 -# Use preinstalled headers (most probably by using make headers_install in a
1.37 +# Use custom headers (most probably by using make headers_install in a
1.38 # modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
1.39 # as 2.4). In this case, simply copy the headers in place
1.40 -do_kernel_preinstalled() {
1.41 +do_kernel_custom() {
1.42 local tar_opt
1.43
1.44 CT_DoLog EXTRA "Installing custom kernel headers"