Minor safety improvements.

[releases.git] / deblob-2.6.24

diff --git a/deblob-2.6.24 b/deblob-2.6.24
index 5e08f606763418059a571861f292bba51b7f3d8f..da1ba3f306f59e0a07a6c49fe4ba6c43865e6b3f 100755 (executable)
--- a/deblob-2.6.24
+++ b/deblob-2.6.24
@@ -40,7 +40,7 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.24 extra=1
+kver=2.6.24 extra=2
 
 sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
 
@@ -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
@@ -268,20 +268,11 @@ clean_blob drivers/media/video/usbvideo/vicam.c
 clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM'
 clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile
 
-# other...
-
-# 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'
 
 #######################
 # Removed net Drivers #
 #######################
 
-
 # ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit
 clean_blob drivers/net/acenic_firmware.h
 clean_kconfig drivers/net/Kconfig 'ACENIC'
@@ -356,7 +347,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