Use foo() notation rather than function foo, for portability. Reported by Daniel...

[releases.git] / deblob-2.6.21

diff --git a/deblob-2.6.21 b/deblob-2.6.21
index e825b793c5427ad9f1c9fd670cac11612f376383..d41d4872ec45969c4838282a283fdc841556e7dc 100755 (executable)
--- a/deblob-2.6.21
+++ b/deblob-2.6.21
@@ -63,7 +63,7 @@ else
   have_check=:
 fi
 
-function clean_file {
+clean_file () {
        #$1 = filename
        if test ! -f $1; then
                die $1 does not exist, something is wrong
@@ -71,7 +71,7 @@ function clean_file {
        rm -v $1
 }
 
-function check_changed {
+check_changed () {
        if test ! -f $1; then
                die $1 does not exist, something is wrong
        elif cmp $1.deblob $1 > /dev/null; then
@@ -80,7 +80,7 @@ function check_changed {
        mv $1.deblob $1
 }
 
-function clean_blob {
+clean_blob () {
        #$1 = filename
        if $have_check; then
            if test ! -f $1; then
@@ -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
@@ -362,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 @@