[kernel] r9509 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc

[Bastian Blank]

Author: waldi
Date: Thu Sep 13 14:46:33 2007
New Revision: 9509

Log:
* debian/config/defines: Make plain image type default.
* debian/config/alpha/defines, debian/config/arm/defines,
  debian/config/armel/defines, debian/config/hppa/defines,
  debian/config/ia64/defines, debian/config/mips/defines,
  debian/config/mipsel/defines, debian/config/sparc/defines:
  Explicitely use kernel-package.
* debian/config/amd64/defines, debian/config/i386/defines,
  debian/config/m68k/defines, debian/config/powerpc/defines,
  debian/config/s390/defines: Use default image type.


Modified:
   dists/trunk/linux-2.6/debian/config/alpha/defines
   dists/trunk/linux-2.6/debian/config/amd64/defines
   dists/trunk/linux-2.6/debian/config/arm/defines
   dists/trunk/linux-2.6/debian/config/armel/defines
   dists/trunk/linux-2.6/debian/config/defines
   dists/trunk/linux-2.6/debian/config/hppa/defines
   dists/trunk/linux-2.6/debian/config/i386/defines
   dists/trunk/linux-2.6/debian/config/ia64/defines
   dists/trunk/linux-2.6/debian/config/m68k/defines
   dists/trunk/linux-2.6/debian/config/mips/defines
   dists/trunk/linux-2.6/debian/config/mipsel/defines
   dists/trunk/linux-2.6/debian/config/powerpc/defines
   dists/trunk/linux-2.6/debian/config/s390/defines
   dists/trunk/linux-2.6/debian/config/sparc/defines

Modified: dists/trunk/linux-2.6/debian/config/alpha/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/alpha/defines	Thu Sep 13 14:46:33 2007
@@ -7,6 +7,7 @@
 
 [image]
 suggests: aboot, fdutils
+type: kernel-package
 
 [alpha-generic_base]
 class: Alpha

Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines	Thu Sep 13 14:46:33 2007
@@ -15,7 +15,6 @@
 conflicts: grub (<= 0.95+cvs20040624-17)
 depends: e2fsprogs (>= 1.35-7)
 suggests: grub (>= 0.97-3) | lilo (>= 19.1)
-type: plain
 
 [amd64_base]
 class: AMD64

Modified: dists/trunk/linux-2.6/debian/config/arm/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/defines	Thu Sep 13 14:46:33 2007
@@ -8,6 +8,7 @@
 
 [image]
 suggests: fdutils
+type: kernel-package
 
 [footbridge_image]
 suggests: nwutil

Modified: dists/trunk/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/armel/defines	Thu Sep 13 14:46:33 2007
@@ -8,6 +8,7 @@
 
 [image]
 suggests: fdutils
+type: kernel-package
 
 [iop32x_base]
 class: IOP32x

Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/defines	Thu Sep 13 14:46:33 2007
@@ -31,7 +31,7 @@
 
 [image]
 initramfs-generators: initramfs-tools yaird initramfs-fallback
-type: kernel-package
+type: plain
 
 [xen]
 dom0-support: false

Modified: dists/trunk/linux-2.6/debian/config/hppa/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/hppa/defines	Thu Sep 13 14:46:33 2007
@@ -9,6 +9,7 @@
 
 [image]
 suggests: palo
+type: kernel-package
 
 [parisc_base]
 class: 32-bit PA-RISC

Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/defines	Thu Sep 13 14:46:33 2007
@@ -14,7 +14,6 @@
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)
 suggests: grub (>= 0.97-3) | lilo (>= 19.1)
-type: plain
 
 [486_base]
 class: x86

Modified: dists/trunk/linux-2.6/debian/config/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/ia64/defines	Thu Sep 13 14:46:33 2007
@@ -9,6 +9,7 @@
 
 [image]
 suggests: elilo, fdutils
+type: kernel-package
 
 [itanium_base]
 class: Itanium

Modified: dists/trunk/linux-2.6/debian/config/m68k/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/m68k/defines	Thu Sep 13 14:46:33 2007
@@ -16,7 +16,6 @@
 [image]
 initramfs: false
 suggests: vmelilo, fdutils
-type: plain
 
 [amiga_base]
 class: Amiga

Modified: dists/trunk/linux-2.6/debian/config/mips/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/defines	Thu Sep 13 14:46:33 2007
@@ -12,6 +12,7 @@
 
 [image]
 initramfs: false
+type: kernel-package
 
 [r4k-ip22_base]
 class: SGI IP22

Modified: dists/trunk/linux-2.6/debian/config/mipsel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/defines	Thu Sep 13 14:46:33 2007
@@ -11,6 +11,7 @@
 
 [image]
 initramfs: false
+type: kernel-package
 
 [r5k-cobalt_base]
 class: Cobalt

Modified: dists/trunk/linux-2.6/debian/config/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/defines	Thu Sep 13 14:46:33 2007
@@ -12,9 +12,6 @@
 kernel-arch: powerpc
 kpkg-subarch: ppc
 
-[image]
-type: plain
-
 [apus_base]
 depends: mkvmlinuz (>= 24)
 kernel-arch: ppc

Modified: dists/trunk/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/s390/defines	Thu Sep 13 14:46:33 2007
@@ -11,7 +11,6 @@
 [image]
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
 suggests: s390-tools
-type: plain
 
 [s390_base]
 class: IBM S/390

Modified: dists/trunk/linux-2.6/debian/config/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/defines	Thu Sep 13 14:46:33 2007
@@ -9,6 +9,7 @@
 
 [image]
 suggests: silo, fdutils
+type: kernel-package
 
 [sparc32_base]
 class: uniprocessor sparc32 (sun4m)