X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=deblob-2.6.27;h=eba13661c2f2615f7333a5ae29906cf6649c7051;hb=14d308052634be4d218a4c517bb32ac54b89213d;hp=40c53f189c5ca2009d71428e63ea903b6d4b3614;hpb=fb36661f424a6ae9061be7e2c745d4b3aac0ab6a;p=releases.git diff --git a/deblob-2.6.27 b/deblob-2.6.27 index 40c53f189c5c..eba13661c2f2 100755 --- a/deblob-2.6.27 +++ b/deblob-2.6.27 @@ -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.27 extra= +kver=2.6.27 extra=++ case $1 in --force) die () { echo ERROR: "$@": ignored >&2; }; shift;; @@ -137,8 +137,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 } @@ -386,7 +385,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 @@