From fb24e23408f76b376c74335c9a4c773fa053bf1c Mon Sep 17 00:00:00 2001 From: lxoliva Date: Mon, 14 Jul 2008 02:39:41 +0000 Subject: [PATCH] Minor safety improvements. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3893 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.23 | 10 +--------- deblob-2.6.24 | 11 +---------- deblob-2.6.25 | 38 ++++++++++++++++++++++---------------- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/deblob-2.6.23 b/deblob-2.6.23 index 14f7dafa5b9..c3d22c71438 100755 --- a/deblob-2.6.23 +++ b/deblob-2.6.23 @@ -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.23 extra=1 +kver=2.6.23 extra=2 sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile @@ -268,19 +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_VIDEO_SAA7134 drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CX88 drivers/media/video/Makefile -clean_kconfig drivers/media/dvb/dvb-core/Kconfig 'DVB_CORE' ####################### # Removed net Drivers # ####################### - # ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit clean_blob drivers/net/acenic_firmware.h clean_kconfig drivers/net/Kconfig 'ACENIC' diff --git a/deblob-2.6.24 b/deblob-2.6.24 index 9eef94de5c5..da1ba3f306f 100755 --- 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 @@ -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' diff --git a/deblob-2.6.25 b/deblob-2.6.25 index 173a73a9550..4b774034299 100755 --- a/deblob-2.6.25 +++ b/deblob-2.6.25 @@ -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.25 extra=1 +kver=2.6.25 extra=2 sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile @@ -53,6 +53,14 @@ sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile if [ ! -f `which unifdef` ] ; then echo "requires unifdef" ; exit ; fi +check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check +if [ ! -f $check ] ; then + echo "optional deblob-check missing, will remove entire files" + have_check=false +else + have_check=: +fi + function clean_file { #$1 = filename rm -v $1 @@ -66,10 +74,9 @@ function check_changed { mv $1.deblob $1 } -check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check function clean_blob { #$1 = filename - if test -f $check; then + if $have_check; then name=$1 echo Removing blobs from $name set fnord "$@" -d @@ -268,20 +275,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' @@ -311,9 +309,12 @@ clean_mk CONFIG_CASSINI drivers/net/Makefile # E100 - Intel(R) PRO/100+ clean_blob drivers/net/e100.c -sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c -# clean_kconfig drivers/net/Kconfig 'E100' -# clean_mk CONFIG_E100 drivers/net/Makefile +if $have_check; then + sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c +else + clean_kconfig drivers/net/Kconfig 'E100' + clean_mk CONFIG_E100 drivers/net/Makefile +fi # MYRI_SBUS - MyriCOM Gigabit Ethernet clean_blob drivers/net/myri_code.h @@ -346,7 +347,12 @@ patch --no-backup-if-mismatch -p0 <<\EOF # patches/linux-2.6-tg3-clean.patch EOF clean_blob drivers/net/tg3.c -s 9 -sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c +if $have_check; then + sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c +else + clean_kconfig drivers/net/Kconfig 'TIGON3' + clean_mk CONFIG_TIGON3 drivers/net/Makefile +fi # TYPHOON - 3cr990 series Typhoon clean_blob drivers/net/typhoon-firmware.h -- 2.31.1