X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.26;h=4254c693cc525fea67f01a3558449d1a559d13f0;hb=14d308052634be4d218a4c517bb32ac54b89213d;hp=5b4c5974a56a376adca7ba54e64ce0443c294339;hpb=34e00f2dbb6cb7d8999e4ca8281273773e7e2821;p=releases.git

diff --git a/deblob-2.6.26 b/deblob-2.6.26
index 5b4c5974a56a..4254c693cc52 100755
--- a/deblob-2.6.26
+++ b/deblob-2.6.26
@@ -44,7 +44,7 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.26 extra=1++
+kver=2.6.26 extra=2++
 
 case $1 in
 --force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
@@ -114,8 +114,7 @@ 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
 }
 
@@ -371,7 +370,9 @@ clean_kconfig drivers/net/Kconfig 'TEHUTI'
 clean_mk CONFIG_TEHUTI 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 @@