Update for 2.6.26-git14.

[releases.git] / deblob-main

diff --git a/deblob-main b/deblob-main
index 4e5372c38da346ea1b4502f06d162294cca5cbca..ba716c2ef3277ada225371371dcd858209276870 100755 (executable)
--- a/deblob-main
+++ b/deblob-main
@@ -157,7 +157,7 @@ echo Extracing linux-$kver.tar into linux-$kver
 tar -xf linux-$kver.tar
 rm -rf linux-$kver-$libre linux-$kver-$libre.tar
 
-echo Copying linux-$kver to linux-$kver-$libre.tar
+echo Copying linux-$kver to linux-$kver-$libre
 cp linux-$kver.tar linux-$kver-$libre.tar
 cp -lR linux-$kver/. linux-$kver-$libre
 
@@ -165,10 +165,11 @@ echo Deblobbing within linux-$kver-$libre
 (cd linux-$kver-$libre && /bin/sh ../$deblob) || exit 1
 rm -f linux-$kver-$libre.patch
 
-cp $0 $deblob deblob-check linux-$kver-$libre
+# Do not copy these scripts for now, deblob-check regards itself as a blog.
+# cp -p $0 $deblob deblob-check linux-$kver-$libre
 
 echo Generating linux-$kver-$libre.patch
-diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch
+diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch || :
 
 echo Removing removed or modified files from linux-$kver-$libre.tar
 diff -rq linux-$kver linux-$kver-$libre |
@@ -193,7 +194,7 @@ echo Wiping out extracted trees
 rm -rf linux-$kver orig-linux-$kver
 
 echo Creating xdelta between linux-$kver.tar and linux-$kver-$libre.tar
-xdelta delta -0 linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.xdelta
+xdelta delta -0 linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.xdelta || :
 
 echo Compressing linux-$kver-$libre.tar and linux-$kver-$libre.xdelta
 rm -f linux-$kver.tar