Update the i.MX31 Kernel to 2.6.232.6.23-mx31ads-2008022618072.6.23-mx31-200802261807

This is the result of a brute-force attempt to update the kernel to 2.6.23.
Now that we have a git tree, our effort will be a little nicer in the future.

Signed-off-by: Justin Waters <justin.waters@timesys.com>

1 files changed, 26 insertions, 1 deletions

diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index a8740df07b09..fae5b3a35977 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -50,6 +50,31 @@ UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
 UTS_LEN=64
 UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
 
+#
+# Strip trailing arguments from ${CC} but
+# keep any prefixed environment variables.
+#
+CCNOARGS=""
+for word in ${CC}; do
+    case $word in
+	*=* )
+	    if [ "${CCNOARGS}"x = x ]; then
+		CCNOARGS="${word}"
+	    else
+		CCNOARGS="${CCNOARGS} ${word}"
+	    fi
+	    ;;
+	* )
+	    break
+	    ;;
+    esac
+done
+if [ "${CCNOARGS}"x = x ]; then
+    CCNOARGS="${word}"
+else
+    CCNOARGS="${CCNOARGS} ${word}"
+fi
+
 # Generate a temporary compile.h
 
 ( echo /\* This file is auto generated, version $VERSION \*/
@@ -71,7 +96,7 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
     echo \#define LINUX_COMPILE_DOMAIN
   fi
 
-  echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
+  echo \#define LINUX_COMPILER \"`$CCNOARGS -v 2>&1 | grep '^gcc version'`\"
 ) > .tmpcompile
 
 # Only replace the real compile.h if the new one is different,