X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.21;h=d41d4872ec45969c4838282a283fdc841556e7dc;hb=dfa4111cec75c68a1e64ccba7d2eed586b151881;hp=ba6c59c2b7c72f1bfadb6988719f67a3f23ea441;hpb=c0666f589eded2565c1324e02d6ab489755eff3c;p=releases.git

diff --git a/deblob-2.6.21 b/deblob-2.6.21
index ba6c59c2b7c7..d41d4872ec45 100755
--- a/deblob-2.6.21
+++ b/deblob-2.6.21
@@ -46,9 +46,13 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.21 extra=0++
 
+case $1 in
+--force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
+*) die () { echo "$@" >&2; exit 1; };;
+esac
+
 if unifdef -Utest /dev/null; then :; else
-    echo unifdef is required >&2
-    exit 1
+    die unifdef is required
 fi
 
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
@@ -59,32 +63,28 @@ else
   have_check=:
 fi
 
-function clean_file {
+clean_file () {
 	#$1 = filename
 	if test ! -f $1; then
-		echo $1 does not exist, something is wrong >&2
-		exit 1
+		die $1 does not exist, something is wrong
 	fi
 	rm -v $1
 }
 
-function check_changed {
+check_changed () {
 	if test ! -f $1; then
-		echo $1 does not exist, something is wrong >&2
-		exit 1
+		die $1 does not exist, something is wrong
 	elif cmp $1.deblob $1 > /dev/null; then
-		echo $1 did not change, something is wrong >&2
-		exit 1
+		die $1 did not change, something is wrong
 	fi
 	mv $1.deblob $1
 }
 
-function clean_blob {
+clean_blob () {
 	#$1 = filename
 	if $have_check; then
 	    if test ! -f $1; then
-		echo $1 does not exist, something is wrong >&2
-		exit 1
+		die $1 does not exist, something is wrong
 	    fi
 	    name=$1
 	    echo Removing blobs from $name
@@ -97,7 +97,7 @@ function clean_blob {
 	fi
 }
 
-function clean_kconfig {
+clean_kconfig () {
         #$1 = filename $2 = things to remove
         echo Marking config $2 as depending on NONFREE in $1
 	sed "/^config \\($2\\)\$/{p;i\
@@ -106,7 +106,7 @@ d;}" $1 > $1.deblob
 	check_changed $1
 }
 
-function clean_mk {
+clean_mk () {
 	#$1 = config $2 = Makefile name
 	# We don't clean up Makefiles any more --lxoliva
 	# sed -i "/\\($1\\)/d" $2
@@ -114,12 +114,11 @@ function clean_mk {
 	if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
 	    :
 	else
-	    echo $2 does not contain matches for $1
-	    exit 1
+	    die $2 does not contain matches for $1
 	fi
 }
 
-function clean_ifdef {
+clean_ifdef () {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
 	unifdef -U$2 $1 > $1.deblob
@@ -163,8 +162,7 @@ for f in \
     sound/pci/cs46xx/imgs/cwcdma.asp \
 ; do
   if test ! $f; then
-    echo $f is not present, something is amiss >&2
-    exit 1
+    die $f is not present, something is amiss
   fi
 done
 
@@ -363,7 +361,9 @@ clean_kconfig drivers/net/Kconfig 'MYRI_SBUS'
 clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile
 
 # TIGON3 - Broadcom Tigon3
-patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch
+patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
+  die failed to remove license comments from drivers/net/tg3.c \
+  # patches/linux-2.6-tg3-clean.patch
 --- drivers/net/tg3.c
 +++ drivers/net/tg3.c
 @@ -5,14 +5,6 @@