[kernel] r6010 - in people/waldi/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/armeb arch/hppa arch/i386 arch/ia64 arch/m68k arch/mips arch/mipsel arch/powerpc arch/powerpc/vserver arch/s390 arch/sparc bin lib/python/debian_linux

Bastian Blank waldi at costa.debian.org
Thu Mar 2 11:42:49 UTC 2006 

Author: waldi
Date: Thu Mar  2 11:42:47 2006
New Revision: 6010

Modified:
   people/waldi/linux-2.6/debian/arch/alpha/defines
   people/waldi/linux-2.6/debian/arch/amd64/defines
   people/waldi/linux-2.6/debian/arch/arm/defines
   people/waldi/linux-2.6/debian/arch/armeb/defines
   people/waldi/linux-2.6/debian/arch/defines
   people/waldi/linux-2.6/debian/arch/hppa/defines
   people/waldi/linux-2.6/debian/arch/i386/defines
   people/waldi/linux-2.6/debian/arch/ia64/defines
   people/waldi/linux-2.6/debian/arch/m68k/defines
   people/waldi/linux-2.6/debian/arch/mips/defines
   people/waldi/linux-2.6/debian/arch/mipsel/defines
   people/waldi/linux-2.6/debian/arch/powerpc/defines
   people/waldi/linux-2.6/debian/arch/powerpc/vserver/defines
   people/waldi/linux-2.6/debian/arch/s390/defines
   people/waldi/linux-2.6/debian/arch/sparc/defines
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   people/waldi/linux-2.6/debian/rules.real
Log:
* debian/arch/defines: Add initramfs-generator relations.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/arm/defines, debian/arch/armeb/defines, debian/arch/hppa/defines,
  debian/arch/i386/defines, debian/arch/ia64/defines, debian/arch/m68k/defines,
  debian/arch/mips/defines, debian/arch/mipsel/defines,
  debian/arch/powerpc/defines, debian/arch/powerpc/vserver/defines,
  debian/arch/s390/defines, debian/arch/sparc/defines:
  Specify initramfs settings.
* debian/bin/gencontrol.py: Generate dependencies for initramfs generators.
* debian/lib/python/debian_linux/config.py: Add more fields.
* debian/lib/python/debian_linux/gencontrol.py: Fix.
* debian/rules.real: Use INITRAMFS.


Modified: people/waldi/linux-2.6/debian/arch/alpha/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/alpha/defines	Thu Mar  2 11:42:47 2006
@@ -4,7 +4,6 @@
 kernel-header-dirs: alpha
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool
 suggests: aboot, fdutils
 
 [alpha-generic]

Modified: people/waldi/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/amd64/defines	Thu Mar  2 11:42:47 2006
@@ -10,7 +10,7 @@
 subarches: vserver
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool, e2fsprogs (>= 1.35-7)
+depends: e2fsprogs (>= 1.35-7)
 suggests: grub | lilo (>= 19.1)
 
 [amd64-generic]

Modified: people/waldi/linux-2.6/debian/arch/arm/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/arm/defines	Thu Mar  2 11:42:47 2006
@@ -9,7 +9,7 @@
 kernel-header-dirs: arm
 
 [image]
-depends: yaird | initramfs-tools | linux-initramfs-tool
+initramfs-generators: yaird initramfs-tools
 suggests: fdutils
 
 [footbridge]

Modified: people/waldi/linux-2.6/debian/arch/armeb/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/armeb/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/armeb/defines	Thu Mar  2 11:42:47 2006
@@ -5,7 +5,7 @@
 kernel-header-dirs: arm
 
 [image]
-depends: yaird | initramfs-tools | linux-initramfs-tool
+initramfs-generators: yaird initramfs-tools
 
 [nslu2]
 class: NSLU2

Modified: people/waldi/linux-2.6/debian/arch/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/defines	Thu Mar  2 11:42:47 2006
@@ -18,12 +18,17 @@
  sparc
 
 [image]
-ramdisk-generators: yaird initramfs-tools
+initramfs-generators: initramfs-tools yaird
 type: kernel-package
 
-[image-ramdisk-generators]
-yaird: mkinitrd.yaird
+[image-initramfs-generators]
 initramfs-tools: mkinitramfs
+yaird: mkinitrd.yaird
+
+[relations-image-initramfs-generators]
+fallback: linux-initramfs-tool
+initramfs-tools: initramfs-tools
+yaird: yaird
 
 [relations]
 gcc: gcc (>= 4:4.0)

Modified: people/waldi/linux-2.6/debian/arch/hppa/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/hppa/defines	Thu Mar  2 11:42:47 2006
@@ -8,7 +8,6 @@
 kernel-header-dirs: parisc
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool
 suggests: palo
 
 [parisc]

Modified: people/waldi/linux-2.6/debian/arch/i386/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/defines	Thu Mar  2 11:42:47 2006
@@ -10,7 +10,6 @@
 subarches: vserver
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool
 suggests: grub | lilo (>= 19.1)
 
 [686]

Modified: people/waldi/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/ia64/defines	Thu Mar  2 11:42:47 2006
@@ -8,7 +8,6 @@
 kernel-header-dirs: ia64
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool
 suggests: elilo, fdutils
 
 [itanium]

Modified: people/waldi/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/m68k/defines	Thu Mar  2 11:42:47 2006
@@ -14,7 +14,7 @@
 kernel-header-dirs: m68k
 
 [image]
-depends: yaird | initramfs-tools | linux-initramfs-tool
+initramfs-generators: yaird initramfs-tools
 suggests: vmelilo, fdutils
 
 [amiga]

Modified: people/waldi/linux-2.6/debian/arch/mips/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/mips/defines	Thu Mar  2 11:42:47 2006
@@ -7,7 +7,7 @@
 kernel-header-dirs: mips
 
 [image]
-initrd: false
+initramfs: false
 
 [r4k-ip22]
 class: SGI IP22

Modified: people/waldi/linux-2.6/debian/arch/mipsel/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mipsel/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/mipsel/defines	Thu Mar  2 11:42:47 2006
@@ -6,7 +6,7 @@
 kernel-header-dirs: mips
 
 [image]
-initrd: false
+initramfs: false
 
 [r5k-cobalt]
 class: Cobalt

Modified: people/waldi/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/defines	Thu Mar  2 11:42:47 2006
@@ -10,19 +10,18 @@
 subarches: vserver
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool
 
 [apus]
-depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 18)
 
 [powerpc]
-depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 18)
 
 [powerpc-smp]
-depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 18)
 
 [powerpc-miboot]
-depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 18)
 
 [powerpc64]
 kpkg-subarch: powerpc64

Modified: people/waldi/linux-2.6/debian/arch/powerpc/vserver/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/vserver/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/vserver/defines	Thu Mar  2 11:42:47 2006
@@ -4,7 +4,7 @@
  powerpc64
 
 [powerpc]
-depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
+depends: mkvmlinuz (>= 18)
 
 [powerpc64]
 kpkg-subarch: powerpc64

Modified: people/waldi/linux-2.6/debian/arch/s390/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/s390/defines	Thu Mar  2 11:42:47 2006
@@ -5,7 +5,7 @@
 
 [image]
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
-depends: yaird | initramfs-tools | linux-initramfs-tool
+initramfs-generators: yaird
 suggests: s390-tools
 
 [s390]

Modified: people/waldi/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/sparc/defines	Thu Mar  2 11:42:47 2006
@@ -5,7 +5,6 @@
  sparc64-smp
 
 [image]
-depends: initramfs-tools | yaird | linux-initramfs-tool
 suggests: silo, fdutils
 
 [sparc32]

Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Thu Mar  2 11:42:47 2006
@@ -83,7 +83,7 @@
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
             ('image-postproc', 'IMAGE_POSTPROC'),
-            ('initrd', 'INITRD',),
+            ('initramfs', 'INITRAMFS',),
             ('type', 'TYPE'),
         ):
             if config_entry.has_key(i[0]):
@@ -103,9 +103,19 @@
         image_latest = self.templates["control.image.latest"]
         headers_latest = self.templates["control.headers.latest"]
 
+        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_relations_initramfs = self.config.merge('relations-image-initramfs-generators', arch, subarch, flavour)
+            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']))
+            image_depends.append(l)
+
         packages_own = []
         packages_dummy = []
-        packages_own.append(self.process_real_image(image[0], vars))
+        packages_own.append(self.process_real_image(image[0], image_depends, vars))
         packages_own.append(self.process_package(headers[0], vars))
         packages_dummy.extend(self.process_packages(image_latest, vars))
         packages_dummy.append(self.process_package(headers_latest[0], vars))
@@ -134,7 +144,7 @@
         makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
         makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
 
-    def process_real_image(self, in_entry, vars):
+    def process_real_image(self, in_entry, depends, vars):
         entry = self.process_package(in_entry, vars)
         if vars.has_key('desc'):
             entry['Description'].long[1:1] = [vars['desc']]
@@ -142,6 +152,8 @@
             value = entry.get(field, package_relation_list())
             t = vars.get(field.lower(), [])
             value.extend(t)
+            if depends and field == 'Depends':
+                value.append(depends)
             entry[field] = value
         return entry
 

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py	Thu Mar  2 11:42:47 2006
@@ -29,6 +29,8 @@
         'arches': schema_item_list(),
         'available': schema_item_boolean(),
         'flavours': schema_item_list(),
+        'initramfs': schema_item_boolean(),
+        'initramfs-generators': schema_item_list(),
         'subarches': schema_item_list(),
     }
 

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Mar  2 11:42:47 2006
@@ -46,8 +46,11 @@
         self.do_main_packages(packages)
         self.do_main_makefile(makefile, makeflags)
 
+        vars = self.changelog_vars.copy()
+        vars.update(self.config['image',])
+
         for arch in iter(self.config['base',]['arches']):
-            self.do_arch(packages, makefile, arch, self.changelog_vars.copy(), makeflags.copy())
+            self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy())
 
     def do_main_makefile(self, makefile, makeflags):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Thu Mar  2 11:42:47 2006
@@ -36,8 +36,8 @@
 kpkg_image := make-kpkg --append-to-version '$(ABINAME)$(LOCALVERSION)'
 kpkg_image += --arch '$(ARCH)'
 kpkg_image += --stem linux
-ifneq ($(INITRD),no)
-	kpkg_image += --initrd
+ifneq ($(INITRAMFS),False)
+  kpkg_image += --initrd
 endif
 ifdef KPKG_SUBARCH
   kpkg_image += --subarch '$(KPKG_SUBARCH)'

More information about the Kernel-svn-changes mailing list