[kernel] r6875 - in dists/trunk/linux-2.6/debian: bin
Bastian Blank
waldi at costa.debian.org
Sat Jun 24 10:53:14 UTC 2006
Author: waldi
Date: Sat Jun 24 10:53:12 2006
New Revision: 6875
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
* debian/bin/gencontrol.py
- Generate build dependencies on compilers.
- Generate dependencies on compilers for the headers packages.
* debian/lib/python/debian_linux/gencontrol.py:
Remove compiler deps generation.
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 Sat Jun 24 10:53:12 2006
@@ -111,8 +111,17 @@
image_latest = self.templates["control.image.latest"]
headers_latest = self.templates["control.headers.latest"]
+ config_entry_base = self.config.merge('base', arch, subarch, flavour)
config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
+ compiler = config_entry_base.get('compiler', 'gcc')
+ relations_compiler = package_relation_list(config_entry_relations[compiler])
+ relations_compiler_build_dep = package_relation_list(config_entry_relations[compiler])
+ for group in relations_compiler_build_dep:
+ for item in group:
+ item.arches = [arch]
+ packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
+
image_depends = package_relation_list()
if vars.get('initramfs', True):
generators = vars['initramfs-generators']
@@ -139,7 +148,9 @@
if image in (image_type_modulesextra, image_type_modulesinline):
makeflags['MODULES'] = True
- packages_own.append(self.process_package(headers[0], vars))
+ package_headers = self.process_package(headers[0], vars)
+ package_headers['Depends'].extend(relations_compiler)
+ packages_own.append(package_headers)
packages_dummy.append(self.process_package(headers_latest[0], vars))
extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sat Jun 24 10:53:12 2006
@@ -169,15 +169,6 @@
if not vars.has_key('longclass'):
vars['longclass'] = vars['class']
- config_base = self.config.merge('base', arch)
- config_relations = self.config.merge('relations', arch)
- compiler = config_base.get('compiler', 'gcc')
- relations_compiler = package_relation_list(config_relations[compiler])
- for group in relations_compiler:
- for item in group:
- item.arches = [arch]
- packages['source']['Build-Depends'].extend(relations_compiler)
-
makeflags['FLAVOUR'] = flavour
vars['localversion'] += '-' + flavour
More information about the Kernel-svn-changes
mailing list