X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.25;h=173a73a955010b16165d49e1598ad23841e1bf30;hb=b5e5572c468d039c38fcd27fe1ee7906c3864f24;hp=8d8e018feb87fcf5cc64a7e1270ed5a36bc46f76;hpb=045cd27ce15ba088fa9d8bc2ef29b38129e57586;p=releases.git

diff --git a/deblob-2.6.25 b/deblob-2.6.25
index 8d8e018feb87..173a73a95501 100755
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -59,7 +59,7 @@ function clean_file {
 }
 
 function check_changed {
-	if cmp $1.deblob $1; then
+	if cmp $1.deblob $1 > /dev/null; then
 		echo $1 did not change, something is wrong >&2
 		exit 1
 	fi
@@ -84,7 +84,7 @@ function clean_blob {
 function clean_kconfig {
         #$1 = filename $2 = things to remove
         echo Marking config $2 as depending on NONFREE in $1
-	sed "/^config $2\$/{p;i\
+	sed "/^config \\($2\\)\$/{p;i\
 	depends on NONFREE
 d;}" $1 > $1.deblob
 	check_changed $1
@@ -93,9 +93,9 @@ d;}" $1 > $1.deblob
 function clean_mk {
 	#$1 = config $2 = Makefile name
 	# We don't clean up Makefiles any more --lxoliva
-	# sed -i "/($1)/d" $2
+	# sed -i "/\\($1\\)/d" $2
 	# check_changed $2
-	if sed -n "/($1)/p" $2 | grep . > /dev/null; then
+	if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
 	    :
 	else
 	    echo $2 does not contain matches for $1
@@ -302,7 +302,7 @@ clean_mk CONFIG_BNX2 drivers/net/Makefile
 
 clean_blob drivers/net/bnx2x_init_values.h
 clean_kconfig drivers/net/Kconfig 'BNX2X'
-clean_mk CONFIG_BNX2X divers/net/Makefile
+clean_mk CONFIG_BNX2X drivers/net/Makefile
 
 # CASSINI - Sun Cassini
 clean_blob drivers/net/cassini.h
@@ -360,7 +360,7 @@ clean_mk CONFIG_TYPHOON drivers/net/Makefile
 # clean_blob drivers/net/appletalk/cops.h
 clean_blob drivers/net/appletalk/cops_ffdrv.h
 clean_blob drivers/net/appletalk/cops_ltdrv.h
-clean_kconfig drivers/net/appletalk/Kconfig 'COPS|COPS_DAYNA|COPS_TANGENT'
+clean_kconfig drivers/net/appletalk/Kconfig 'COPS'
 clean_mk CONFIG_COPS drivers/net/appletalk/Makefile
 
 # hamradio