From 9708faa9c9ade5b94dd622613a9a6acb02a6c170 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 29 Mar 2006 11:44:51 +0000 Subject: [PATCH] * 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 --- debian/bin/gencontrol.py | 2 +- debian/lib/python/debian_linux/config.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index c5d200490..472e1e0fc 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -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']) diff --git a/debian/lib/python/debian_linux/config.py b/debian/lib/python/debian_linux/config.py index b6b02f291..55ed5ff85 100644 --- a/debian/lib/python/debian_linux/config.py +++ b/debian/lib/python/debian_linux/config.py @@ -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(), }