Adjust a few 2.6.23 false positive matches.

[releases.git] / deblob-2.6.23

diff --git a/deblob-2.6.23 b/deblob-2.6.23
index 51a288e3e48cc2ed6c920c3dca8a1cf522241fe0..14f7dafa5b98deea1be0f2a5405f6da134fafe0c 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
@@ -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
@@ -272,10 +272,9 @@ clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile
 
 # disable -- appears to neeed other DVB bits
 clean_mk CONFIG_DVB_CORE drivers/media/Makefile
-clean_mk CONFIG_VIDEOBUF_DVB drivers/media/video/Makefile
 clean_mk CONFIG_VIDEO_SAA7134 drivers/media/video/Makefile
 clean_mk CONFIG_VIDEO_CX88 drivers/media/video/Makefile
-clean_kconfig drivers/media/Kconfig 'VIDEOBUF_DVB'
+clean_kconfig drivers/media/dvb/dvb-core/Kconfig 'DVB_CORE'
 
 #######################
 # Removed net Drivers #
@@ -356,7 +355,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