1.1 --- a/scripts/build/kernel/linux.sh	Wed Sep 10 21:40:23 2008 +0000
     1.2 +++ b/scripts/build/kernel/linux.sh	Mon Sep 15 14:52:29 2008 +0000
     1.3 @@ -3,13 +3,12 @@
     1.4  # Licensed under the GPL v2. See COPYING in the root of this package
     1.5  
     1.6  do_print_filename() {
     1.7 -    [ "${CT_KERNEL}" = "linux" ] || return 0
     1.8      echo "linux-${CT_KERNEL_VERSION}"
     1.9  }
    1.10  
    1.11  # Download the kernel
    1.12  do_kernel_get() {
    1.13 -    if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
    1.14 +    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
    1.15          CT_GetFile "${CT_KERNEL_FILE}" {ftp,http}://ftp.kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
    1.16      fi
    1.17      return 0
    1.18 @@ -17,7 +16,7 @@
    1.19  
    1.20  # Extract kernel
    1.21  do_kernel_extract() {
    1.22 -    if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" != "y" ]; then
    1.23 +    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" != "y" ]; then
    1.24          CT_ExtractAndPatch "${CT_KERNEL_FILE}"
    1.25      fi
    1.26      return 0
    1.27 @@ -27,7 +26,7 @@
    1.28  do_kernel_headers() {
    1.29      CT_DoStep INFO "Installing kernel headers"
    1.30  
    1.31 -    if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" = "y" ]; then
    1.32 +    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_DIR}" = "y" ]; then
    1.33          do_kernel_preinstalled
    1.34      else
    1.35          do_kernel_install
    1.36 @@ -59,7 +58,7 @@
    1.37           ${V_OPT}                                   \
    1.38           headers_install
    1.39  
    1.40 -    if [ "${CT_KERNEL_LINUX_HEADERS_INSTALL_CHECK}" = "y" ]; then
    1.41 +    if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then
    1.42          CT_DoLog EXTRA "Checking installed headers"
    1.43          CT_DoExecLog ALL                                \
    1.44          make -C "${CT_SRC_DIR}/${CT_KERNEL_FILE}"       \
    1.45 @@ -79,6 +78,6 @@
    1.46      CT_DoLog EXTRA "Copying preinstalled kernel headers"
    1.47  
    1.48      mkdir -p "${CT_SYSROOT_DIR}/usr"
    1.49 -    cd "${CT_KERNEL_LINUX_HEADERS_CUSTOM_DIR}"
    1.50 -    cp -rv include "${CT_SYSROOT_DIR}/usr" 2>&1 |CT_DoLog ALL
    1.51 +    cd "${CT_KERNEL_LINUX_CUSTOM_DIR}"
    1.52 +    CT_DoExecLog ALL cp -rv include "${CT_SYSROOT_DIR}/usr"
    1.53  }