diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-06-15 18:04:01 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-06-15 18:04:01 (GMT) |
| commit | f99f3208af85ea356acb7d85c544665163030c7a (patch) | |
| tree | 02be9cc15edee029558c60cfb4e508cd4759d32a /scripts | |
| parent | 979c2abb86eb632e57c89a0f7b205b27acd54698 (diff) | |
kernel/linux: reorder upstream/custom-tree handling
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/kernel/linux.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 1d08f30..e5ea57f 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -17,30 +17,28 @@ CT_DoKernelTupleValues() { # Download the kernel do_kernel_get() { - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then + if [ "${CT_KERNEL_LINUX_INSTALL}" = "y" ]; then CT_GetFile "linux-${CT_KERNEL_VERSION}" \ {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2} fi - return 0 } # Extract kernel do_kernel_extract() { - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then + if [ "${CT_KERNEL_LINUX_INSTALL}" = "y" ]; then CT_Extract "linux-${CT_KERNEL_VERSION}" CT_Patch "linux" "${CT_KERNEL_VERSION}" fi - return 0 } # Wrapper to the actual headers install method do_kernel_headers() { CT_DoStep INFO "Installing kernel headers" - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then - do_kernel_custom - else + if [ "${CT_KERNEL_LINUX_INSTALL}" = "y" ]; then do_kernel_install + else + do_kernel_custom fi CT_EndStep |