From f99f3208af85ea356acb7d85c544665163030c7a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 15 Jun 2010 20:04:01 +0200
Subject: kernel/linux: reorder upstream/custom-tree handling

---
 scripts/build/kernel/linux.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 1d08f303..e5ea57f5 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
-- 
cgit v1.2.3