diff --git a/debian/arch/defines b/debian/arch/defines index 433a084e2..789d92153 100644 --- a/debian/arch/defines +++ b/debian/arch/defines @@ -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 diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 85bd6cd61..2e9691f28 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -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 = []