[PATCH 2 of 2] correction of previous patch : use a custom kernel directory (not prepared)

[sinseman44@gmail.com]

# HG changeset patch
# User Sinseman44 <sinseman44@gmail.com>
# Date 1316983092 -7200
# Node ID 106357704d6aee847860584cba15dc10ab8f99d5
# Parent  7e4e1c6f74e1064fda7020b2b75fb54d57183f81
correction of previous patch : use a custom kernel directory (not prepared)

Signed-off-by: Vincent BENOIT <sinseman44@gmail.com>

diff -r 7e4e1c6f74e1 -r 106357704d6a config/kernel/linux.in
--- a/config/kernel/linux.in	Thu Sep 22 22:49:38 2011 +0200
+++ b/config/kernel/linux.in	Sun Sep 25 22:38:12 2011 +0200
@@ -144,9 +144,9 @@
     help
       Use a local tarball or local kernel directory of a complete kernel source tree.
 
-config KERNEL_LINUX_CUSTOM_TARBALL
+config KERNEL_LINUX_CUSTOM_LOCATION
     string
-    prompt "Path to custom tarball or directory"
+    prompt "Path to custom source, tarball or directory"
     depends on KERNEL_LINUX_CUSTOM
     help
       Enter here the path to the tarball of your full kernel tree or
diff -r 7e4e1c6f74e1 -r 106357704d6a scripts/build/kernel/linux.sh
--- a/scripts/build/kernel/linux.sh	Thu Sep 22 22:49:38 2011 +0200
+++ b/scripts/build/kernel/linux.sh	Sun Sep 25 22:38:12 2011 +0200
@@ -25,21 +25,21 @@
     fi
 
     if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then
-        # Wee need to know the custom tarball extension,
-        # so we can cerate a properly-named symlink, which
-        # we use later on in 'extract'
-        if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then
-            case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" in
+        if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
+			# Wee need to know the custom tarball extension,
+			# so we can create a properly-named symlink, which
+			# we use later on in 'extract'
+            case "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" in
                 *.tar.bz2)      custom_name="linux-custom.tar.bz2";;
                 *.tar.gz|*.tgz) custom_name="linux-custom.tar.gz";;
                 *.tar)          custom_name="linux-custom.tar";;
-                *)  CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_TARBALL}'";;
+                *)  CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_LOCATION}'";;
             esac
-            CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}"  \
+            CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"  \
                                       "${CT_TARBALLS_DIR}/${custom_name}"
         else
             custom_name="linux-custom"
-            CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_TARBALL}"  \
+            CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"  \
                                       "${CT_SRC_DIR}/${custom_name}"
         fi
        
@@ -72,7 +72,7 @@
 # Extract kernel
 do_kernel_extract() {
     if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \
-         -o -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then
+         -o -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
         return 0
     fi
    

--
For unsubscribe information see http://sourceware.org/lists.html#faq