[kernel] r16069 - in dists/sid/linux-2.6/debian: config patches/bugfix/all/stable

[Ben Hutchings]

Author: benh
Date: Tue Aug  3 00:41:54 2010
New Revision: 16069

Log:
Define the files and versions that have been backported, and use them in gen-patch

Modified:
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/gen-patch

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Mon Aug  2 17:02:44 2010	(r16068)
+++ dists/sid/linux-2.6/debian/config/defines	Tue Aug  3 00:41:54 2010	(r16069)
@@ -70,3 +70,22 @@
 initramfs-tools: initramfs-tools (>= 0.55)
 util-vserver: util-vserver (>= 0.30.215)
 
+[backports]
+drivers/block/drbd/: 2.6.33
+drivers/gpu/drm/: 2.6.33
+drivers/hwmon/via-cputemp.c: 2.6.33
+drivers/net/sfc/: 2.6.33
+drivers/scsi/3w-sas.c: 2.6.33
+drivers/scsi/3w-sas.h: 2.6.33
+drivers/staging/ramzswap/: 2.6.33
+drivers/media/dvb/mantis/: 2.6.34
+drivers/net/macvtap.c: 2.6.34
+drivers/net/usb/ipheth.c: 2.6.34
+drivers/staging/rt2860sta/: 2.6.34
+drivers/staging/rt2870sta/: 2.6.34
+drivers/staging/rtl8192su/: 2.6.34
+drivers/staging/rtl8192u/: 2.6.34
+drivers/staging/udlfb/: 2.6.34
+drivers/usb/serial/usb_wwan.c: 2.6.34
+drivers/usb/serial/usb-wwan.h: 2.6.34
+drivers/staging/xgifb/: 2.6.35

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/gen-patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/gen-patch	Mon Aug  2 17:02:44 2010	(r16068)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/gen-patch	Tue Aug  3 00:41:54 2010	(r16069)
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
 import os.path, re, sys, textwrap
+sys.path.append('debian/lib/python')
+from debian_linux.config import ConfigCoreHierarchy
+from debian_linux.debian import Changelog
 
 class Version(object):
     _rules = ur"^(\d+\.\d+\.\d+)\.(\d+)$"
@@ -16,6 +19,8 @@
 
 class GenPatch(object):
     def __init__(self, path, repo, version):
+        self.config = ConfigCoreHierarchy(['debian/config'])
+        self.package_version = Changelog()[0].version
         self.path = path
         self.repo = repo
         self.version = version
@@ -33,11 +38,24 @@
         tag_out = "v%s" % self.version.complete
         print tag_in, tag_out
 
-        f = os.popen("cd %s; git diff %s %s | filterdiff -p 1 -x Makefile > %s" % (self.repo, tag_in, tag_out, os.path.join(self.path, patch)))
+        backports = self.config[('backports',)]
+        diff_filter = '-x Makefile'
+        if self.version.release == self.package_version.upstream:
+            diff_filter += ' ' + ' '.join("-x '%s'" % re.sub(r'/$', r'/*', path)
+                                          for path in backports)
+            git_paths = ''
+        else:
+            git_paths = ' '.join("'%s'" % path for path in backports
+                                 if backports[path] == self.version.release)
+
+        f = os.popen("cd %s; git diff %s %s -- %s | filterdiff -p 1 %s > %s" %
+                     (self.repo, tag_in, tag_out, git_paths, diff_filter,
+                      os.path.join(self.path, patch)))
         if f.close() is not None:
             raise RuntimeError
 
-        f = os.popen("cd %s; git log --oneline --reverse %s..%s^" % (self.repo, tag_in, tag_out))
+        f = os.popen("cd %s; git log --oneline --reverse %s..%s^ -- %s" %
+                     (self.repo, tag_in, tag_out, git_paths))
         out = file(os.path.join(self.path, log), 'w')
         out.write("  * Add stable release %s:\n" % self.version.complete)
         for line in f: