1.1 --- a/scripts/build/kernel/linux.sh Wed Apr 07 09:18:20 2010 +0200
1.2 +++ b/scripts/build/kernel/linux.sh Tue Jun 15 20:04:01 2010 +0200
1.3 @@ -17,30 +17,28 @@
1.4
1.5 # Download the kernel
1.6 do_kernel_get() {
1.7 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
1.8 + if [ "${CT_KERNEL_LINUX_INSTALL}" = "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 - return 0
1.13 }
1.14
1.15 # Extract kernel
1.16 do_kernel_extract() {
1.17 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
1.18 + if [ "${CT_KERNEL_LINUX_INSTALL}" = "y" ]; then
1.19 CT_Extract "linux-${CT_KERNEL_VERSION}"
1.20 CT_Patch "linux" "${CT_KERNEL_VERSION}"
1.21 fi
1.22 - return 0
1.23 }
1.24
1.25 # Wrapper to the actual headers install method
1.26 do_kernel_headers() {
1.27 CT_DoStep INFO "Installing kernel headers"
1.28
1.29 - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
1.30 + if [ "${CT_KERNEL_LINUX_INSTALL}" = "y" ]; then
1.31 + do_kernel_install
1.32 + else
1.33 do_kernel_custom
1.34 - else
1.35 - do_kernel_install
1.36 fi
1.37
1.38 CT_EndStep