X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flmake;fp=build%2Flmake;h=73e3bbc7eb82f258e7e4f545a7d74916c9de2ea8;hp=787e279644b142ea6ac250668ea9d18a5c05695d;hb=0fdc61b8eb9c42939b086f221d4bdb9d0a6c9caf;hpb=407e4d6a3753379f1f6ed405220ee04a2c935b89

diff --git a/build/lmake b/build/lmake
index 787e279..73e3bbc 100755
--- a/build/lmake
+++ b/build/lmake
@@ -242,7 +242,7 @@ load_target()
 #    [ "$SERIES" ] || fatal 1 "Target $TARGET did not specify a patch series."
 #    [ "$CONFIG" ] || fatal 1 "Target $TARGET did not specify a kernel config."
     [ "$VERSION" ] || fatal 1 "Target $TARGET did not specify the kernel version."
-    
+
     if [ "$KERNELDIR" ] ; then
 	KERNEL_FILE="$KERNELDIR/$KERNEL"
 	[ -r "$KERNELDIR/$KERNEL" ] || \
@@ -284,10 +284,10 @@ setup_ccache_distcc()
             unset DISTCC
         fi
     fi
-    
+
     CC=${CC:-gcc}
     if [ "$CCACHE" ]; then
-        CC="$CCACHE $CC"
+        [[ $CC != ccache\ * ]] && CC="$CCACHE $CC"
         [ "$DISTCC" ] && export CCACHE_PREFIX="$DISTCC"
     else
         [ "$DISTCC" ] && CC="$DISTCC $CC"
@@ -330,7 +330,7 @@ extract_kernel()
 	[ -L linux ] && rm -rf $(readlink linux)
 	rm -rf linux
     fi
-    untar "$KERNEL_FILE"
+    untar "$KERNEL_FILE" || fatal 1 "Error unpacking Linux tarball"
     [ -d linux ] || ln -sf linux* linux
     popd >/dev/null
 }