r3475 - trunk/scripts

[Andres Salomon]

Author: dilinger
Date: 2005-07-12 11:06:58 +0000 (Tue, 12 Jul 2005)
New Revision: 3475

Modified:
   trunk/scripts/prune-non-free
Log:
update prune-nonfree to generate linux-2.6 and linux-nonfree-2.6 tarballs.


Modified: trunk/scripts/prune-non-free
===================================================================
--- trunk/scripts/prune-non-free	2005-07-12 11:02:40 UTC (rev 3474)
+++ trunk/scripts/prune-non-free	2005-07-12 11:06:58 UTC (rev 3475)
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 # prune-non-free - split out undistributable drivers, and generate
-# linux-kernel and linux-kernel-nonfree tarballs.
+# linux and linux-nonfree tarballs.
 #
 #    Copyright (C) 2005  Andres Salomon <dilinger@debian.org>
 #
@@ -257,8 +257,11 @@
 
 # Create source directories
 version = kversion(ARGV[0])
-free_dir = "linux-kernel-#{version}-#{version}"
-nonfree_dir = "linux-kernel-nonfree-#{version}-#{version}"
+raise "Error: unable to determine tree from version string #{version}!"
+		unless version =~ /^(\d+)\.(\d+)\./
+tree = $1
+free_dir = "linux-#{tree}-#{version}"
+nonfree_dir = "linux-nonfree-#{tree}-#{version}"
 unpack(ARGV[0], free_dir)
 FileUtils.mkdir_p(nonfree_dir)
 
@@ -294,9 +297,9 @@
 dont_nuke_debian_dir(free_dir)
 
 # Tar up the kernel source trees
-pack("linux-kernel-#{version}_#{version}.orig.tar.gz", free_dir)
+pack("linux-#{tree}_#{version}.orig.tar.gz", free_dir)
 FileUtils.rm_rf(free_dir) 
-pack("linux-kernel-nonfree-#{version}_#{version}.orig.tar.gz", nonfree_dir)
+pack("linux-nonfree-#{tree}_#{version}.orig.tar.gz", nonfree_dir)
 FileUtils.rm_rf(nonfree_dir)
 
 exit(0)