X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.24;h=d5a8732632dd100bedf0a952179775a3c3c61306;hb=4ac82ffecfd7d245feb528146fae682cb1f32937;hp=c838cf4c1d85fdec60e77b743efcb0a882dc14d0;hpb=34e00f2dbb6cb7d8999e4ca8281273773e7e2821;p=releases.git diff --git a/deblob-2.6.24 b/deblob-2.6.24 index c838cf4c1d85..d5a8732632dd 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -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 } @@ -367,7 +366,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 @@