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"