[kernel] r19885 - in dists/trunk/linux/debian: . bin

[Ben Hutchings]

Author: benh
Date: Sat Mar  2 16:02:15 2013
New Revision: 19885

Log:
genorig: Accept xz-compressed upstream tarballs and patches, thanks to Sedat Dilek

Modified:
   dists/trunk/linux/debian/bin/genorig.py
   dists/trunk/linux/debian/changelog

Modified: dists/trunk/linux/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux/debian/bin/genorig.py	Sat Mar  2 04:21:44 2013	(r19884)
+++ dists/trunk/linux/debian/bin/genorig.py	Sat Mar  2 16:02:15 2013	(r19885)
@@ -58,7 +58,7 @@
                                          '--prefix=%s/' % self.orig, self.tag],
                                         cwd=input_repo,
                                         stdout=subprocess.PIPE)
-        extract_proc = subprocess.Popen(['tar', '-xf', '-'], cwd=self.dir,
+        extract_proc = subprocess.Popen(['tar', '-xaf', '-'], cwd=self.dir,
                                         stdin=archive_proc.stdout)
 
         if extract_proc.wait():
@@ -66,15 +66,11 @@
 
     def upstream_extract(self, input_tar):
         self.log("Extracting tarball %s\n" % input_tar)
-        match = re.match(r'(^|.*/)(?P<dir>linux-\d+\.\d+(\.\d+)?(-\S+)?)\.tar(\.(?P<extension>(bz2|gz)))?$', input_tar)
+        match = re.match(r'(^|.*/)(?P<dir>linux-\d+\.\d+(\.\d+)?(-\S+)?)\.tar(\.(?P<extension>(bz2|gz|xz)))?$', input_tar)
         if not match:
             raise RuntimeError("Can't identify name of tarball")
 
-        cmdline = ['tar', '-xf', input_tar, '-C', self.dir]
-        if match.group('extension') == 'bz2':
-            cmdline.append('-j')
-        elif match.group('extension') == 'gz':
-            cmdline.append('-z')
+        cmdline = ['tar', '-xaf', input_tar, '-C', self.dir]
 
         if subprocess.Popen(cmdline).wait():
             raise RuntimeError("Can't extract tarball")
@@ -83,7 +79,7 @@
 
     def upstream_patch(self, input_patch):
         self.log("Patching source with %s\n" % input_patch)
-        match = re.match(r'(^|.*/)patch-\d+\.\d+\.\d+(-\S+?)?(\.(?P<extension>(bz2|gz)))?$', input_patch)
+        match = re.match(r'(^|.*/)patch-\d+\.\d+\.\d+(-\S+?)?(\.(?P<extension>(bz2|gz|xz)))?$', input_patch)
         if not match:
             raise RuntimeError("Can't identify name of patch")
         cmdline = []
@@ -91,6 +87,8 @@
             cmdline.append('bzcat')
         elif match.group('extension') == 'gz':
             cmdline.append('zcat')
+        elif match.group('extension') == 'xz':
+            cmdline.append('xzcat')
         else:
             cmdline.append('cat')
         cmdline.append(input_patch)

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Mar  2 04:21:44 2013	(r19884)
+++ dists/trunk/linux/debian/changelog	Sat Mar  2 16:02:15 2013	(r19885)
@@ -6,6 +6,8 @@
   [ Ben Hutchings ]
   * linux-image: Increase minimum version of initramfs-tools to 0.110~
     which copes with the recently renamed EHCI and NFS modules
+  * genorig: Accept xz-compressed upstream tarballs and patches,
+    thanks to Sedat Dilek
 
   [ Aurelien Jarno ]
   * [mips/octeon] Change HW_RANDOM and HW_RANDOM_OCTEON to modules.