debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* 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.

svn path=/dists/trunk/linux-2.6/; revision=6875
This commit is contained in:
Bastian Blank 2006-06-24 10:53:12 +00:00
parent f37c3acc20
commit ebc6106981
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/bin/gencontrol.py vendored
View File

@ -111,8 +111,17 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
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 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
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'])

9
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -169,15 +169,6 @@ class gencontrol(object):
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