r4048 - trunk/scripts

[Bastian Blank]

Author: waldi
Date: 2005-08-24 11:15:13 +0000 (Wed, 24 Aug 2005)
New Revision: 4048

Modified:
   trunk/scripts/prune-non-free
Log:
prune-non-free
- Update files list to match 2.6.13.
- Add debian version argument.
- Don't remove output trees.


Modified: trunk/scripts/prune-non-free
===================================================================
--- trunk/scripts/prune-non-free	2005-08-24 08:31:57 UTC (rev 4047)
+++ trunk/scripts/prune-non-free	2005-08-24 11:15:13 UTC (rev 4048)
@@ -38,16 +38,6 @@
 	drivers/net/tokenring/smctr.h
 	drivers/net/tokenring/smctr_firmware.h
 
-	drivers/scsi/qla2xxx/qla_devtbl.h
-	drivers/scsi/qla2xxx/qla_os.c
-	drivers/scsi/qla2xxx/qla_init.c
-	drivers/scsi/qla2xxx/qla_mbx.c
-	drivers/scsi/qla2xxx/qla_iocb.c
-	drivers/scsi/qla2xxx/qla_isr.c
-	drivers/scsi/qla2xxx/qla_gs.c
-	drivers/scsi/qla2xxx/qla_dbg.c
-	drivers/scsi/qla2xxx/qla_sup.c
-	drivers/scsi/qla2xxx/qla_rscn.c
 	drivers/scsi/qla2xxx/ql2100.c
 	drivers/scsi/qla2xxx/ql2100_fw.c
 	drivers/scsi/qla2xxx/ql2200.c
@@ -58,6 +48,24 @@
 	drivers/scsi/qla2xxx/ql2322_fw.c
 	drivers/scsi/qla2xxx/ql6312.c
 	drivers/scsi/qla2xxx/ql6312_fw.c
+	drivers/scsi/qla2xxx/qla_attr.c
+	drivers/scsi/qla2xxx/qla_dbg.c
+	drivers/scsi/qla2xxx/qla_dbg.h
+	drivers/scsi/qla2xxx/qla_def.h
+	drivers/scsi/qla2xxx/qla_devtbl.h
+	drivers/scsi/qla2xxx/qla_fw.h
+	drivers/scsi/qla2xxx/qla_gbl.h
+	drivers/scsi/qla2xxx/qla_gs.c
+	drivers/scsi/qla2xxx/qla_init.c
+	drivers/scsi/qla2xxx/qla_inline.h
+	drivers/scsi/qla2xxx/qla_iocb.c
+	drivers/scsi/qla2xxx/qla_isr.c
+	drivers/scsi/qla2xxx/qla_mbx.c
+	drivers/scsi/qla2xxx/qla_os.c
+	drivers/scsi/qla2xxx/qla_settings.h
+	drivers/scsi/qla2xxx/qla_rscn.c
+	drivers/scsi/qla2xxx/qla_sup.c
+	drivers/scsi/qla2xxx/qla_version.h
 
 	drivers/usb/media/dabusb.c
 	drivers/usb/media/dabusb.h
@@ -126,14 +134,6 @@
 	tf.path
 end
 
-def kversion(file)
-	tarball = File.basename(file)
-	unless tarball =~ /^linux-([0-9\.]+)\.tar.*$/
-		raise "cannot determine kernel version from '#{tarball}'!"
-	end
-	$1
-end
-
 def zip_type(tarball)
 	if tarball =~ /\.gz$/
 		'z'
@@ -253,10 +253,10 @@
 	FileUtils.mv(name + '.new', name)
 end
 
-raise "Usage: #{$0} <kernel tarball>" unless ARGV.length == 1
+raise "Usage: #{$0} <kernel tarball> <debian version>" unless ARGV.length == 2
 
 # Create source directories
-version = kversion(ARGV[0])
+version = ARGV[1]
 raise "Error: unable to determine tree from version string #{version}!" unless version =~ /^(\d+\.\d+)\./
 tree = $1
 free_dir = "linux-#{tree}-#{version}"
@@ -297,8 +297,6 @@
 
 # Tar up the kernel source trees
 pack("linux-#{tree}_#{version}.orig.tar.gz", free_dir)
-FileUtils.rm_rf(free_dir) 
 pack("linux-nonfree-#{tree}_#{version}.orig.tar.gz", nonfree_dir)
-FileUtils.rm_rf(nonfree_dir)
 
 exit(0)