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(-)
1.1 --- a/scripts/build/kernel/linux.sh Sun Jan 04 14:14:49 2009 +0000
1.2 +++ b/scripts/build/kernel/linux.sh Sun Jan 04 14:18:20 2009 +0000
1.3 @@ -10,7 +10,7 @@
1.4 # Download the kernel
1.5 do_kernel_get() {
1.6 if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
1.7 - CT_GetFile "${CT_KERNEL_FILE}" {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
1.8 + CT_GetFile "linux-${CT_KERNEL_VERSION}" {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
1.9 fi
1.10 return 0
1.11 }
1.12 @@ -18,7 +18,7 @@
1.13 # Extract kernel
1.14 do_kernel_extract() {
1.15 if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
1.16 - CT_ExtractAndPatch "${CT_KERNEL_FILE}"
1.17 + CT_ExtractAndPatch "linux-${CT_KERNEL_VERSION}"
1.18 fi
1.19 return 0
1.20 }
1.21 @@ -45,28 +45,28 @@
1.22
1.23 # Only starting with 2.6.18 does headers_install is usable. We only
1.24 # have 2.6 version available, so only test for sublevel.
1.25 - k_sublevel=$(gawk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/${CT_KERNEL_FILE}/Makefile")
1.26 + k_sublevel=$(gawk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
1.27 [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
1.28
1.29 V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
1.30
1.31 CT_DoLog EXTRA "Installing kernel headers"
1.32 - CT_DoExecLog ALL \
1.33 - make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
1.34 - O=$(pwd) \
1.35 - ARCH=${CT_KERNEL_ARCH} \
1.36 - INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
1.37 - ${V_OPT} \
1.38 + CT_DoExecLog ALL \
1.39 + make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \
1.40 + O=$(pwd) \
1.41 + ARCH=${CT_KERNEL_ARCH} \
1.42 + INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
1.43 + ${V_OPT} \
1.44 headers_install
1.45
1.46 if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then
1.47 CT_DoLog EXTRA "Checking installed headers"
1.48 - CT_DoExecLog ALL \
1.49 - make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}" \
1.50 - O=$(pwd) \
1.51 - ARCH=${CT_KERNEL_ARCH} \
1.52 - INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
1.53 - ${V_OPT} \
1.54 + CT_DoExecLog ALL \
1.55 + make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \
1.56 + O=$(pwd) \
1.57 + ARCH=${CT_KERNEL_ARCH} \
1.58 + INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \
1.59 + ${V_OPT} \
1.60 headers_check
1.61 find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \;
1.62 fi
2.1 --- a/scripts/crosstool.sh Sun Jan 04 14:14:49 2009 +0000
2.2 +++ b/scripts/crosstool.sh Sun Jan 04 14:18:20 2009 +0000
2.3 @@ -85,7 +85,6 @@
2.4 CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
2.5
2.6 # Now, build up the variables from the user-configured options.
2.7 -CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"
2.8 CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
2.9 CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
2.10 CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"