[kernel] r6330 - dists/trunk/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Wed Mar 29 11:41:51 2006
New Revision: 6330

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Make it possible to disable headers packages.


Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Wed Mar 29 11:41:51 2006
@@ -123,9 +123,12 @@
             packages_own.append(p)
 
         packages_own.append(self.process_real_image(image[0], image_depends, vars))
-        packages_own.append(self.process_package(headers[0], vars))
         packages_dummy.extend(self.process_packages(image_latest, vars))
-        packages_dummy.append(self.process_package(headers_latest[0], vars))
+
+        if self.config.merge('headers', arch, subarch, flavour).get('enable', 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'])
 
         for package in packages_own + packages_dummy:
             name = package['Package']
@@ -136,8 +139,6 @@
                 package['Architecture'] = [arch]
                 packages.append(package)
 
-        extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[1]['Package'])
-
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_arch = []