r986 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian

[Andres Salomon]

Author: dilinger-guest
Date: 2004-08-08 11:24:41 -0600 (Sun, 08 Aug 2004)
New Revision: 986

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free
Log:
Don't bother running tg3.c through sed


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-08 17:22:13 UTC (rev 985)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-08 17:24:41 UTC (rev 986)
@@ -1,6 +1,9 @@
 kernel-source-2.6.8 (2.6.8-1) unstable; urgency=high
 
   * New upstream release.
+  
+  * Nuke tg3.c properly in prune-non-free; rely on patch to supply driver
+    (Andres Salomon).
 
  -- Andres Salomon <dilinger@voxel.net>  Sun, 08 Aug 2004 13:09:15 -0400
 

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free	2004-08-08 17:22:13 UTC (rev 985)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free	2004-08-08 17:24:41 UTC (rev 986)
@@ -13,6 +13,7 @@
 # outright remove firmware-only files
 rm -f drivers/net/acenic_firmware.h
 rm -f drivers/net/dgrs_firmware.c
+rm -f drivers/net/tg3.c
 rm -f drivers/net/tokenring/smctr_firmware.h
 rm -f drivers/scsi/qla2xxx/ql2100_fw.c
 rm -f drivers/scsi/qla2xxx/ql2200_fw.c
@@ -37,6 +38,5 @@
 rm -f drivers/usb/serial/keyspan_usa49wlc_fw.h
 
 # prune the firmware from the Tigon3 driver, leaving the rest in place
-awk '/^(static )?u32.*tg3(Tso)?5?Fw(Data|Rodata|Text)/,/^};$/{evil=1}!evil{print}{evil=0}' drivers/net/tg3.c > drivers/net/tg3.c.pruned
-mv drivers/net/tg3.c.pruned drivers/net/tg3.c
-rm -f drivers/net/tg3.c
+#awk '/^(static )?u32.*tg3(Tso)?5?Fw(Data|Rodata|Text)/,/^};$/{evil=1}!evil{print}{evil=0}' drivers/net/tg3.c > drivers/net/tg3.c.pruned
+#mv drivers/net/tg3.c.pruned drivers/net/tg3.c