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

[Bastian Blank]

Author: waldi
Date: Wed Mar  8 10:30:06 2006
New Revision: 6103

Modified:
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
Log:
* debian/arch/defines: Update section name.
* debian/bin/gencontrol.py: Provide our own list of usable 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	Wed Mar  8 10:30:06 2006
@@ -21,7 +21,7 @@
 initramfs-generators: initramfs-tools yaird
 type: kernel-package
 
-[image-initramfs-generators]
+[commands-image-initramfs-generators]
 initramfs-tools: mkinitramfs
 yaird: mkinitrd.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	Wed Mar  8 10:30:06 2006
@@ -104,8 +104,10 @@
         image_depends = package_relation_list()
         if vars.get('initramfs', True):
             generators = vars['initramfs-generators']
-            config_entry_initramfs = self.config.merge('image-initramfs-generators', arch, subarch, flavour)
+            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)
+            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']))