* debian/bin/gencontrol.py: Disabled modules support disabled headers as well.

* debian/lib/python/debian_linux/config.py: Add new entries.

svn path=/dists/trunk/linux-2.6/; revision=6331
This commit is contained in:
Bastian Blank 2006-03-29 11:44:51 +00:00
parent 97d1862558
commit 9708faa9c9
2 changed files with 2 additions and 1 deletions

View File

@ -125,7 +125,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
packages_own.append(self.process_real_image(image[0], image_depends, vars))
packages_dummy.extend(self.process_packages(image_latest, vars))
if self.config.merge('headers', arch, subarch, flavour).get('enable', True):
if vars.get('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'])

View File

@ -33,6 +33,7 @@ class config_reader(dict):
'available': schema_item_boolean(),
'flavours': schema_item_list(),
'initramfs': schema_item_boolean(),
'modules': schema_item_boolean(),
'initramfs-generators': schema_item_list(),
'subarches': schema_item_list(),
}