It's enough to mark COPS as dependent on NONFREE, other COPS_ configs depend on it...

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3556 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-2.6.23 b/deblob-2.6.23
index 51a288e3e48cc2ed6c920c3dca8a1cf522241fe0..828828e78819ff8990998ea2a11453d5d4a83650 100755 (executable)
--- a/deblob-2.6.23
+++ b/deblob-2.6.23
@@ -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
@@ -356,7 +356,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

diff --git a/deblob-2.6.24 b/deblob-2.6.24
index 3f14360ae5fdaeeef103bfc98a81fdce33f4fd42..9fb289e18298d30a51d6bc263b50606a0cf36549 100755 (executable)
--- a/deblob-2.6.24
+++ b/deblob-2.6.24
@@ -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
@@ -356,7 +356,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

diff --git a/deblob-2.6.25 b/deblob-2.6.25
index e57da05d3b0a5aabbcf846f6d94b36f32ea8c3e2..751d4db4fd038088f05f0a3425ce398469a4e9e0 100755 (executable)
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -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
@@ -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