* debian/bin/gencontrol.py: Use different templates depending on type.

* debian/rules.real: Fix detection of headers build.
* debian/templates/control.image.type-modulesextra.in,
  debian/templates/control.image.type-modulesinline.in,
  debian/templates/control.image.type-standalone.in: Add.
* debian/templates/control.image.in,
  debian/templates/control.modules.in: Remove.

svn path=/dists/trunk/linux-2.6/; revision=6339

debian/bin/gencontrol.py

@@ -89,16 +89,16 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
             ('localversion', 'LOCALVERSION'),
-            ('modules', 'MODULES',),
             ('type', 'TYPE'),
         ):
             if vars.has_key(i[0]):
                 makeflags[i[1]] = vars[i[0]]
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
-        image = self.templates["control.image"]
+        image_type_modulesextra = self.templates["control.image.type-modulesextra"]
+        image_type_modulesinline = self.templates["control.image.type-modulesinline"]
+        image_type_standalone = self.templates["control.image.type-standalone"]
         headers = self.templates["control.headers"]
-        modules = self.templates["control.modules"]
         image_latest = self.templates["control.image.latest"]
         headers_latest = self.templates["control.headers.latest"]
 
@@ -117,16 +117,19 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
         packages_own = []
         packages_dummy = []
 
-        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)
+        if vars['type'] == 'plain-s390-tape':
+            image = image_type_standalone
+        elif vars['type'] == 'plain-xen':
+            image = image_type_modulesextra
+        else:
+            image = image_type_modulesinline
 
         packages_own.append(self.process_real_image(image[0], image_depends, vars))
+        packages_own.extend(self.process_packages(image[1:], vars))
         packages_dummy.extend(self.process_packages(image_latest, vars))
 
-        if vars.get('modules', True):
+        if image in (image_type_modulesextra, image_type_modulesinline):
+            makeflags['MODULES'] = True
             packages_own.append(self.process_package(headers[0], vars))
             packages_dummy.append(self.process_package(headers_latest[0], vars))
             extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])

debian/rules.real

@@ -69,7 +69,7 @@ endif
 binary-arch-arch: install-headers-all install-headers-$(ARCH)
 binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
 binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
-ifneq ($(MODULES),False)
+ifeq ($(MODULES),True)
   binary-arch-flavour: install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 endif
 

debian/templates/control.image.type-modulesextra.in

@@ -0,0 +1,20 @@
+Package: linux-image-@upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Provides: linux-image, linux-image-@major@
+Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${Source-Version})
+Suggests: linux-doc-@version@ | linux-source-@version@
+Description: Linux kernel @upstreamversion@ image on @class@ machines
+ This package provides the binary image for
+ Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-image packages
+
+Package: linux-modules-@upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Depends: module-init-tools (>= 0.9.13)
+Description: Linux kernel modules @upstreamversion@ image on @class@ machines
+ This package provides pre-built loadable modules for
+ Linux kernel @version@ on @longclass@ machines.

debian/templates/control.image.type-standalone.in

@@ -0,0 +1,11 @@
+Package: linux-image-@upstreamversion@@abiname@@localversion@
+Section: base
+Priority: optional
+Provides: linux-image, linux-image-@major@
+Suggests: linux-doc-@version@ | linux-source-@version@
+Description: Linux kernel @upstreamversion@ image on @class@ machines
+ This package provides the binary image for
+ Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-image packages

debian/templates/control.modules.in

@@ -1,8 +0,0 @@
-Package: linux-modules-@upstreamversion@@abiname@@localversion@
-Section: base
-Priority: optional
-Depends: module-init-tools (>= 0.9.13)
-Reverse-Depends: linux-modules-@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.