From 26e96f3ec5b4f644db0a178bf981af38a472b0e0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 4 Jan 2009 14:18:20 +0000
Subject: [PATCH] Get rid off CT_KERNEL_FILE.

 /trunk/scripts/build/kernel/linux.sh |   30    15    15     0 +++++++++++++++---------------
 /trunk/scripts/crosstool.sh          |    1     0     1     0 -
 2 files changed, 15 insertions(+), 16 deletions(-)
---
 scripts/build/kernel/linux.sh | 30 +++++++++++++++---------------
 scripts/crosstool.sh          |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 35f5deea..2d66dfe4 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -10,7 +10,7 @@ CT_DoKernelTupleValues() {
 # Download the kernel
 do_kernel_get() {
     if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
-        CT_GetFile "${CT_KERNEL_FILE}" {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
+        CT_GetFile "linux-${CT_KERNEL_VERSION}" {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
     fi
     return 0
 }
@@ -18,7 +18,7 @@ do_kernel_get() {
 # Extract kernel
 do_kernel_extract() {
     if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
-        CT_ExtractAndPatch "${CT_KERNEL_FILE}"
+        CT_ExtractAndPatch "linux-${CT_KERNEL_VERSION}"
     fi
     return 0
 }
@@ -45,28 +45,28 @@ do_kernel_install() {
 
     # Only starting with 2.6.18 does headers_install is usable. We only
     # have 2.6 version available, so only test for sublevel.
-    k_sublevel=$(gawk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/${CT_KERNEL_FILE}/Makefile")
+    k_sublevel=$(gawk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
     [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
 
     V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
 
     CT_DoLog EXTRA "Installing kernel headers"
-    CT_DoExecLog ALL                                \
-    make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}"       \
-         O=$(pwd)                                   \
-         ARCH=${CT_KERNEL_ARCH}                     \
-         INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"   \
-         ${V_OPT}                                   \
+    CT_DoExecLog ALL                                    \
+    make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"  \
+         O=$(pwd)                                       \
+         ARCH=${CT_KERNEL_ARCH}                         \
+         INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
+         ${V_OPT}                                       \
          headers_install
 
     if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then
         CT_DoLog EXTRA "Checking installed headers"
-        CT_DoExecLog ALL                                \
-        make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}"       \
-             O=$(pwd)                                   \
-             ARCH=${CT_KERNEL_ARCH}                     \
-             INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"   \
-             ${V_OPT}                                   \
+        CT_DoExecLog ALL                                    \
+        make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"  \
+             O=$(pwd)                                       \
+             ARCH=${CT_KERNEL_ARCH}                         \
+             INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
+             ${V_OPT}                                       \
              headers_check
         find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \;
     fi
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index 8ca708d3..373036b2 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -85,7 +85,6 @@ CT_CC_CORE_EXTRA_CONFIG="${CT_ARCH_CC_CORE_EXTRA_CONFIG} ${CT_CC_CORE_EXTRA_CONF
 CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
 
 # Now, build up the variables from the user-configured options.
-CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"
 CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
 CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
 CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"