[kernel] r6428 - in dists/sid/linux-2.6-exp/debian: bin templates

[Bastian Blank]

Author: waldi
Date: Fri Apr 14 18:57:40 2006
New Revision: 6428

Modified:
   dists/sid/linux-2.6-exp/debian/bin/gencontrol.py
   dists/sid/linux-2.6-exp/debian/templates/control.image.in
   dists/sid/linux-2.6-exp/debian/templates/control.modules.in
Log:
debian/bin/gencontrol.py,
debian/templates/control.image.in,
debian/templates/control.modules.in: Fix support for non-xen images.


Modified: dists/sid/linux-2.6-exp/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6-exp/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6-exp/debian/bin/gencontrol.py	Fri Apr 14 18:57:40 2006
@@ -96,6 +96,8 @@
 
         if vars['type'] == 'plain-xen':
             p = self.process_package(modules[0], vars)
+            image_depends.extend(p['Reverse-Depends'])
+            del p['Reverse-Depends']
             packages_own.append(p)
 
         packages_own.append(self.process_real_image(image[0], image_depends, vars))
@@ -116,7 +118,7 @@
 
         cmds_binary_arch = []
         cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
-        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags_string),))
         cmds_build = []
         cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
         cmds_setup = []

Modified: dists/sid/linux-2.6-exp/debian/templates/control.image.in
==============================================================================
--- dists/sid/linux-2.6-exp/debian/templates/control.image.in	(original)
+++ dists/sid/linux-2.6-exp/debian/templates/control.image.in	Fri Apr 14 18:57:40 2006
@@ -2,7 +2,7 @@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@
-Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${Source-Version})
+Depends: module-init-tools (>= 0.9.13)
 Suggests: linux-doc- at version@ | linux-source- at version@
 Description: Linux kernel @upstreamversion@ image on @class@ machines
  This package provides the binary image and pre-built loadable modules for

Modified: dists/sid/linux-2.6-exp/debian/templates/control.modules.in
==============================================================================
--- dists/sid/linux-2.6-exp/debian/templates/control.modules.in	(original)
+++ dists/sid/linux-2.6-exp/debian/templates/control.modules.in	Fri Apr 14 18:57:40 2006
@@ -2,6 +2,7 @@
 Section: base
 Priority: optional
 Depends: module-init-tools (>= 0.9.13)
+Reverse-Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${Source-Version})
 Description: Linux kernel modules @upstreamversion@ image on @class@ machines
  This package provides pre-built loadable modules for
  Linux kernel @version@ on @longclass@ machines.