From 52c5b06255bca23ebfb8ffc068288e46d12755ce Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 26 Sep 2011 22:59:14 +0200
Subject: kernel/linux: prepare for 3.1 and above

The real upstream location is not in the '3.0' directory, but
in the '3.x' directory.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index e6d9061..12fbe6c 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -19,6 +19,8 @@ CT_DoKernelTupleValues() {
 do_kernel_get() {
     local k_ver
     local custom_name
+    local rel_dir
+    local korg_base mirror_base
 
     if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y"  ]; then
         return 0
@@ -56,15 +58,15 @@ do_kernel_get() {
                 k_ver="${CT_KERNEL_VERSION}"
                 ;;
         esac
-        CT_GetFile "linux-${CT_KERNEL_VERSION}"                                             \
-                   http://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.6                    \
-                   http://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v3.0                    \
-                   http://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.6/longterm/v${k_ver} \
-                   http://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v3.0/longterm/v${k_ver} \
-                   http://ftp.free.fr/mirrors/ftp.kernel.org//linux/kernel/v2.6             \
-                   http://ftp.free.fr/mirrors/ftp.kernel.org//linux/kernel/v3.0             \
-                   http://ftp.free.fr/mirrors/ftp.kernel.org//linux/kernel/v2.6/longterm/v${k_ver}  \
-                   http://ftp.free.fr/mirrors/ftp.kernel.org//linux/kernel/v3.0/longterm/v${k_ver}
+        case "${CT_KERNEL_VERSION}" in
+            2.6.*)  rel_dir=v2.6;;
+            3.*)    rel_dir=v3.x;;
+        esac
+        korg_base="http://ftp.kernel.org/pub/linux/kernel/${rel_dir}"
+        mirror_base="http://ftp.free.fr/mirrors/ftp.kernel.org//linux/kernel/${rel_dir}"
+        CT_GetFile "linux-${CT_KERNEL_VERSION}"                         \
+                   "${korg_base}" "${korg_base}/longterm/v${k_ver}"     \
+                   "${mirror_base}" "${mirror_base}/longterm/v${k_ver}"
     fi
 }
 
-- 
cgit v0.10.2-6-g49f6