From 15fd35c0399779eaf9f0daff1b8e2320a392ffcc Mon Sep 17 00:00:00 2001 From: lxoliva Date: Mon, 19 May 2008 00:39:58 +0000 Subject: [PATCH] It's enough to mark COPS as dependent on NONFREE, other COPS_ configs depend on it. Fix marking of multiple configs in a single regex nevertheless. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3556 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.23 | 4 ++-- deblob-2.6.24 | 4 ++-- deblob-2.6.25 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deblob-2.6.23 b/deblob-2.6.23 index 51a288e3e48..828828e7881 100755 --- 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 3f14360ae5f..9fb289e1829 100755 --- 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 e57da05d3b0..751d4db4fd0 100755 --- 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 -- 2.31.1