Fix poor-man's dirname idiom.

Deblob xc.c, cx18-firmware.c, iwl-agn.c, ISDN_DIVAS and qla2xxx/Kconfig.
Releasing 2.6.28-libre2.
Releasing 2.6.29-libre.

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

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index 0db10927e2bfb37c2cdd8aa60ce03e35fdb26a41..b55862e64fb674396f8b4f0c9157a6ce92e8953d 100755 (executable)
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -44,7 +44,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.28 extra=1++
+kver=2.6.28 extra=2
 
 fatal () {
   echo "$@"
@@ -56,7 +56,7 @@ case $1 in
 *) die () { fatal "$@"; }; forced=false;;
 esac
 
-check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
+check=`echo "$0" | sed 's,[^/]*$,,;s,^$,.,;s,/*$,,'`/deblob-check
 if [ ! -f $check ] ; then
   if $forced; then
     die deblob-check script missing, will remove entire files
@@ -362,6 +362,9 @@ announce ARCH_NETX - "Hilscher NetX based"
 clean_sed '
 s,\([" ]\)request_firmware(,\1reject_firmware(,
 ' arch/arm/mach-netx/xc.c 'disabled non-Free firmware-loading machinery'
+clean_blob arch/arm/mach-netx/xc.c
+clean_kconfig arch/arm/Kconfig 'ARCH_NETX'
+clean_mk CONFIG_ARCH_NETX arch/arm/Makefile
 
 
 #######
@@ -763,6 +766,7 @@ announce VIDEO_CX18 - "Conexant cx23418 MPEG encoder support"
 reject_firmware drivers/media/video/cx18/cx18-av-firmware.c
 reject_firmware drivers/media/video/cx18/cx18-firmware.c
 clean_blob drivers/media/video/cx18/cx18-av-firmware.c
+clean_blob drivers/media/video/cx18/cx18-firmware.c
 clean_kconfig drivers/media/video/cx18/Kconfig 'VIDEO_CX18'
 clean_mk CONFIG_VIDEO_CX18 drivers/media/video/cx18/Makefile
 
@@ -1300,6 +1304,16 @@ clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBT3C'
 clean_mk CONFIG_BT_HCIBT3C drivers/bluetooth/Makefile
 
 
+########
+# ISDN #
+########
+
+announce ISDN_DIVAS - "Support Eicon DIVA Server cards"
+clean_blob drivers/isdn/hardware/eicon/cardtype.h
+clean_blob drivers/isdn/hardware/eicon/dsp_defs.h
+clean_kconfig drivers/isdn/hardware/eicon/Kconfig 'ISDN_DIVAS'
+clean_mk CONFIG_ISDN_DIVAS drivers/isdn/hardware/eicon/Makefile
+
 ##########
 # Serial #
 ##########
@@ -1415,6 +1429,12 @@ announce SCSI_QLA_FC - "QLogic QLA2XXX Fibre Channel Support"
 reject_firmware drivers/scsi/qla2xxx/qla_gbl.h
 reject_firmware drivers/scsi/qla2xxx/qla_init.c
 reject_firmware drivers/scsi/qla2xxx/qla_os.c
+clean_sed '
+/^config SCSI_QLA_FC$/,/^config /{
+  /^   By default, firmware/i\
+       /*(DEBLOBBED)*/
+  /^   By default, firmware/,/ftp:[/][/].*firmware[/]/d
+}' drivers/scsi/qla2xxx/Kconfig 'removed firmware notes'
 clean_blob drivers/scsi/qla2xxx/qla_os.c
 clean_kconfig drivers/scsi/qla2xxx/Kconfig 'SCSI_QLA_FC'
 clean_mk CONFIG_SCSI_QLA_FC drivers/scsi/qla2xxx/Makefile

diff --git a/deblob-2.6.29 b/deblob-2.6.29
index 17687371e7c181b47bdcc7edc249689e485d75b7..7dc8dd4ede5870ce67e89e2d8d8cbb7ae7a9050c 100755 (executable)
--- a/deblob-2.6.29
+++ b/deblob-2.6.29
@@ -44,7 +44,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.29 extra=--++
+kver=2.6.29 extra=
 
 fatal () {
   echo "$@"
@@ -56,7 +56,7 @@ case $1 in
 *) die () { fatal "$@"; }; forced=false;;
 esac
 
-check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
+check=`echo "$0" | sed 's,[^/]*$,,;s,^$,.,;s,/*$,,'`/deblob-check
 if [ ! -f $check ] ; then
   if $forced; then
     die deblob-check script missing, will remove entire files
@@ -362,6 +362,9 @@ announce ARCH_NETX - "Hilscher NetX based"
 clean_sed '
 s,\([" ]\)request_firmware(,\1reject_firmware(,
 ' arch/arm/mach-netx/xc.c 'disabled non-Free firmware-loading machinery'
+clean_blob arch/arm/mach-netx/xc.c
+clean_kconfig arch/arm/Kconfig 'ARCH_NETX'
+clean_mk CONFIG_ARCH_NETX arch/arm/Makefile
 
 
 #######
@@ -763,6 +766,7 @@ announce VIDEO_CX18 - "Conexant cx23418 MPEG encoder support"
 reject_firmware drivers/media/video/cx18/cx18-av-firmware.c
 reject_firmware drivers/media/video/cx18/cx18-firmware.c
 clean_blob drivers/media/video/cx18/cx18-av-firmware.c
+clean_blob drivers/media/video/cx18/cx18-firmware.c
 clean_kconfig drivers/media/video/cx18/Kconfig 'VIDEO_CX18'
 clean_mk CONFIG_VIDEO_CX18 drivers/media/video/cx18/Makefile
 
@@ -1167,6 +1171,7 @@ clean_mk CONFIG_IWL3945 drivers/net/wireless/iwlwifi/Makefile
 
 announce IWLAGN - "Intel Wireless WiFi Next Gen AGN"
 reject_firmware drivers/net/wireless/iwlwifi/iwl-agn.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-agn.c
 clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLAGN'
 clean_mk CONFIG_IWLAGN drivers/net/wireless/iwlwifi/Makefile
 
@@ -1342,6 +1347,16 @@ clean_blob drivers/net/wimax/i2400m/usb.c
 clean_kconfig drivers/net/wimax/i2400m/Kconfig CONFIG_WIMAX_I2400M
 clean_mk CONFIG_WIMAX_I2400M drivers/net/wimax/i2400m/Makefile
 
+########
+# ISDN #
+########
+
+announce ISDN_DIVAS - "Support Eicon DIVA Server cards"
+clean_blob drivers/isdn/hardware/eicon/cardtype.h
+clean_blob drivers/isdn/hardware/eicon/dsp_defs.h
+clean_kconfig drivers/isdn/hardware/eicon/Kconfig 'ISDN_DIVAS'
+clean_mk CONFIG_ISDN_DIVAS drivers/isdn/hardware/eicon/Makefile
+
 ##########
 # Serial #
 ##########
@@ -1471,6 +1486,12 @@ announce SCSI_QLA_FC - "QLogic QLA2XXX Fibre Channel Support"
 reject_firmware drivers/scsi/qla2xxx/qla_gbl.h
 reject_firmware drivers/scsi/qla2xxx/qla_init.c
 reject_firmware drivers/scsi/qla2xxx/qla_os.c
+clean_sed '
+/^config SCSI_QLA_FC$/,/^config /{
+  /^   By default, firmware/i\
+       /*(DEBLOBBED)*/
+  /^   By default, firmware/,/ftp:[/][/].*firmware[/]/d
+}' drivers/scsi/qla2xxx/Kconfig 'removed firmware notes'
 clean_blob drivers/scsi/qla2xxx/qla_os.c
 clean_kconfig drivers/scsi/qla2xxx/Kconfig 'SCSI_QLA_FC'
 clean_mk CONFIG_SCSI_QLA_FC drivers/scsi/qla2xxx/Makefile