X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.28;h=9d1484103beb09f97028c3ff3c1b7afcf7000fd9;hb=14d308052634be4d218a4c517bb32ac54b89213d;hp=4c67a1491f3eb68aa3c4a0ec7ca085068f3adc3e;hpb=f175dad390a9eef639a2853029e7e66683299374;p=releases.git

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index 4c67a1491f3e..9d1484103beb 100755
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -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.28 extra=++
+kver=2.6.28 extra=
 
 case $1 in
 --force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
@@ -150,8 +150,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
 }
 
@@ -405,7 +404,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 @@
@@ -729,7 +730,7 @@ clean_mk CONFIG_SLICOSS drivers/staging/slicoss/Makefile
 # SXG - Alacritech SLIC Technology Non-Accelerated 10Gbe cards
 clean_blob drivers/staging/sxg/saharadbgdownload.h
 clean_blob drivers/staging/sxg/sxgphycode.h
-clean_kconfig driivers/staging/sxg/Kconfig 'SXG'
+clean_kconfig drivers/staging/sxg/Kconfig 'SXG'
 clean_mk CONFIG_SXG drivers/staging/sxg/Makefile
 
 exit 0