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

* debian/arch/defines: Merge relations sections. 

* debian/bin/gencontrol.py: Use common relations section for initramfs generators.

svn path=/dists/trunk/linux-2.6/; revision=6194
This commit is contained in:
Bastian Blank 2006-03-16 14:57:44 +00:00
parent fe864e9721
commit b03e80bd3a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/arch/defines vendored
View File

@ -25,12 +25,10 @@ type: kernel-package
initramfs-tools: mkinitramfs-kpkg
yaird: mkinitrd.yaird
[relations-image-initramfs-generators]
fallback: linux-initramfs-tool
initramfs-tools: initramfs-tools (>= 0.53)
yaird: yaird
[relations]
gcc: gcc (>= 4:4.0)
gcc-3.3: gcc-3.3
initramfs-fallback: linux-initramfs-tool
initramfs-tools: initramfs-tools (>= 0.53)
yaird: yaird

6
debian/bin/gencontrol.py vendored
View File

@ -108,12 +108,12 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
if vars.get('initramfs', True):
generators = vars['initramfs-generators']
config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, subarch, flavour)
config_entry_relations_initramfs = self.config.merge('relations-image-initramfs-generators', arch, subarch, flavour)
config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
makeflags['INITRD_CMD'] = ' '.join(commands)
l = package_relation_group()
l.extend([package_relation(config_entry_relations_initramfs[i]) for i in generators])
l.append(package_relation(config_entry_relations_initramfs['fallback']))
l.extend([package_relation(config_entry_relations[i]) for i in generators])
l.append(package_relation(config_entry_relations['initramfs-fallback']))
image_depends.append(l)
packages_own = []