[kernel] r8109 - in dists/trunk: linux-modules-contrib-2.6/debian/bin linux-modules-contrib-2.6/debian/templates linux-modules-nonfree-2.6/debian/bin linux-modules-nonfree-2.6/debian/templates linux-modules-nonfree-2.6/kqemu

[Daniel Baumann]

Author: daniel
Date: Fri Jan  5 14:28:53 2007
New Revision: 8109

Modified:
   dists/trunk/linux-modules-contrib-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-modules-contrib-2.6/debian/templates/control.modules.in
   dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-modules-nonfree-2.6/debian/templates/control.modules.in
   dists/trunk/linux-modules-nonfree-2.6/kqemu/defines
Log:
Synchronising with l-m-e-2.6.

Modified: dists/trunk/linux-modules-contrib-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/bin/gencontrol.py	Fri Jan  5 14:28:53 2007
@@ -32,9 +32,6 @@
             for arch in self.config['base',]['arches']],
         )
 
-        for module in iter(self.config['base',]['modules']):
-            packages['source']['Build-Depends'].append('%s-source' % module)
-
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         config_entry = self.config.merge('base', arch, subarch, flavour)
         if config_entry.get('modules', True) is False:
@@ -51,10 +48,10 @@
 
     def do_module(self, module, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         config_entry = self.config['base', module]
+        config_entry_relations = self.config.get(('relations', module), {})
         vars.update(config_entry)
         vars['module'] = module
         makeflags['MODULE'] = module
-        makeflags['MODULESOURCE'] = "%s-source" % module
 
         if not vars.get('longdesc', None):
             vars['longdesc'] = ''
@@ -67,6 +64,19 @@
             return
         if subarch in config_entry.get('not-subarches', []):
             return
+        if flavour not in config_entry.get('flavours', [flavour]):
+            return
+        if flavour in config_entry.get('not-flavours', []):
+            return
+
+        relations = package_relation_list(config_entry_relations.get('source', '%s-source' % module))
+        if config_entry.get('arches', None) or config_entry.get('not-arches', None):
+            for group in relations:
+                for item in group:
+                    item.arches = [arch]
+        makeflags['MODULESOURCE'] = relations[0][0].name
+
+        packages['source']['Build-Depends'].extend(relations)
 
         modules = self.templates["control.modules"]
         modules = self.process_packages(modules, vars)

Modified: dists/trunk/linux-modules-contrib-2.6/debian/templates/control.modules.in
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/templates/control.modules.in	(original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/templates/control.modules.in	Fri Jan  5 14:28:53 2007
@@ -1,7 +1,7 @@
 Package: @module at -modules-@upstreamversion@@abiname@@localversion@
 Section: contrib/admin
 Priority: optional
-Depends: linux-image- at upstreamversion@@abiname@@localversion@
+Depends: linux-modules- at upstreamversion@@abiname@@localversion@
 Description: @desc@ modules for Linux @upstreamversion@ on @class@
  This package provides the @desc@ modules for the Linux kernel version
  @upstreamversion@ on @longclass@ machines.

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py	Fri Jan  5 14:28:53 2007
@@ -32,9 +32,6 @@
             for arch in self.config['base',]['arches']],
         )
 
-        for module in iter(self.config['base',]['modules']):
-            packages['source']['Build-Depends'].append('%s-source' % module)
-
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         config_entry = self.config.merge('base', arch, subarch, flavour)
         if config_entry.get('modules', True) is False:
@@ -51,10 +48,10 @@
 
     def do_module(self, module, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         config_entry = self.config['base', module]
+        config_entry_relations = self.config.get(('relations', module), {})
         vars.update(config_entry)
         vars['module'] = module
         makeflags['MODULE'] = module
-        makeflags['MODULESOURCE'] = "%s-source" % module
 
         if not vars.get('longdesc', None):
             vars['longdesc'] = ''
@@ -67,6 +64,19 @@
             return
         if subarch in config_entry.get('not-subarches', []):
             return
+        if flavour not in config_entry.get('flavours', [flavour]):
+            return
+        if flavour in config_entry.get('not-flavours', []):
+            return
+
+        relations = package_relation_list(config_entry_relations.get('source', '%s-source' % module))
+        if config_entry.get('arches', None) or config_entry.get('not-arches', None):
+            for group in relations:
+                for item in group:
+                    item.arches = [arch]
+        makeflags['MODULESOURCE'] = relations[0][0].name
+
+        packages['source']['Build-Depends'].extend(relations)
 
         modules = self.templates["control.modules"]
         modules = self.process_packages(modules, vars)

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/templates/control.modules.in
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/templates/control.modules.in	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/templates/control.modules.in	Fri Jan  5 14:28:53 2007
@@ -1,7 +1,7 @@
 Package: @module at -modules-@upstreamversion@@abiname@@localversion@
 Section: non-free/admin
 Priority: optional
-Depends: linux-image- at upstreamversion@@abiname@@localversion@
+Depends: linux-modules- at upstreamversion@@abiname@@localversion@
 Description: @desc@ modules for Linux @upstreamversion@ on @class@
  This package provides the @desc@ modules for the Linux kernel version
  @upstreamversion@ on @longclass@ machines.

Modified: dists/trunk/linux-modules-nonfree-2.6/kqemu/defines
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/kqemu/defines	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/kqemu/defines	Fri Jan  5 14:28:53 2007
@@ -2,11 +2,6 @@
 arches:
   amd64
   i386
-not-flavours:
-  xen
-  xen-686
-  xen-k7
-  xen-vserver
-  xen-vserver-686
 desc: QEMU Accelerator
+not-subarches: vserver xen-vserver