[kernel] r6194 - in dists/trunk/linux-2.6/debian: arch bin

[Bastian Blank]

Author: waldi
Date: Thu Mar 16 14:57:44 2006
New Revision: 6194

Modified:
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
Log:
* debian/arch/defines: Merge relations sections.
* debian/bin/gencontrol.py: Use common relations section for initramfs generators.


Modified: dists/trunk/linux-2.6/debian/arch/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/defines	Thu Mar 16 14:57:44 2006
@@ -25,12 +25,10 @@
 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
 

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	Thu Mar 16 14:57:44 2006
@@ -108,12 +108,12 @@
         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 = []