[kernel] r7086 - in dists/trunk/linux-modules-extra-2.6: unionfs

[Bastian Blank]

Author: waldi
Date: Fri Aug  4 17:18:00 2006
New Revision: 7086

Modified:
   dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-modules-extra-2.6/unionfs/defines

Log:
* debian/bin/gencontrol.py: Support negated arch and subarch lists.
* unionfs/defines: Disable on vserver and xen-vserver.


Modified: dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	Fri Aug  4 17:18:00 2006
@@ -50,8 +50,12 @@
 
         if arch not in config_entry.get('arches', [arch]):
             return
+        if arch in config_entry.get('not-arches', []):
+            return
         if subarch not in config_entry.get('subarches', [subarch]):
             return
+        if subarch in config_entry.get('not-subarches', [subarch]):
+            return
 
         modules = self.templates["control.modules"]
         modules = self.process_packages(modules, vars)

Modified: dists/trunk/linux-modules-extra-2.6/unionfs/defines
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/unionfs/defines	(original)
+++ dists/trunk/linux-modules-extra-2.6/unionfs/defines	Fri Aug  4 17:18:00 2006
@@ -5,5 +5,5 @@
  kernel. It allows to virtually merge the contents of several
  directories and/or stack them, so that apparent file changes in the
  unionfs end in file changes in only one of the source directories.
-subarches: none
+not-subarches: vserver xen-vserver