Author: waldi Date: Sun Jul 29 16:26:02 2007 New Revision: 9225 Log: debian/config: Make base explicit.
Modified: dists/trunk/linux-2.6/debian/config/alpha/defines dists/trunk/linux-2.6/debian/config/alpha/vserver/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/hppa/defines dists/trunk/linux-2.6/debian/config/i386/defines dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines dists/trunk/linux-2.6/debian/config/i386/xen/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 Sun Jul 29 16:26:02 2007 @@ -8,11 +8,11 @@ [image] suggests: aboot, fdutils -[alpha-generic] +[alpha-generic_base] class: Alpha -[alpha-smp] +[alpha-smp_base] class: Alpha SMP -[alpha-legacy] +[alpha-legacy_base] class: Alpha Legacy Modified: dists/trunk/linux-2.6/debian/config/alpha/vserver/defines ============================================================================== --- dists/trunk/linux-2.6/debian/config/alpha/vserver/defines (original) +++ dists/trunk/linux-2.6/debian/config/alpha/vserver/defines Sun Jul 29 16:26:02 2007 @@ -5,7 +5,7 @@ configs: _vserver/config recommends: util-vserver -[alpha] +[alpha_base] class: Alpha [alpha_image] 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 Sun Jul 29 16:26:02 2007 @@ -14,7 +14,7 @@ suggests: grub (>= 0.97-3) | lilo (>= 19.1) type: plain -[amd64] +[amd64_base] class: AMD64 longclass: all 64bit single- and multiprocessor AMD and Intel 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 Sun Jul 29 16:26:02 2007 @@ -12,19 +12,19 @@ [footbridge_image] suggests: nwutil -[footbridge] +[footbridge_base] class: Footbridge based longclass: Footbridge (CATS, Netwinder) -[iop32x] +[iop32x_base] class: IOP32x longclass: IOP32x based (Thecus N2100, etc) -[ixp4xx] +[ixp4xx_base] class: IXP4xx longclass: IXP4xx based (Linksys NSLU2, etc) -[versatile] +[versatile_base] class: Versatile longclass: Versatile (PB, AB, Qemu) 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 Sun Jul 29 16:26:02 2007 @@ -9,21 +9,21 @@ [image] suggests: fdutils -[iop32x] +[iop32x_base] class: IOP32x longclass: IOP32x based (Thecus N2100, etc) [iop32x_image] configs: arm/config.iop32x -[ixp4xx] +[ixp4xx_base] class: IXP4xx longclass: IXP4xx based (Linksys NSLU2, etc) [ixp4xx_image] configs: arm/config.ixp4xx -[versatile] +[versatile_base] class: Versatile longclass: Versatile (PB, AB, Qemu) 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 Sun Jul 29 16:26:02 2007 @@ -10,18 +10,18 @@ [image] suggests: palo -[parisc] +[parisc_base] class: 32-bit PA-RISC -[parisc-smp] +[parisc-smp_base] class: multiprocessor 32-bit PA-RISC -[parisc64] +[parisc64_base] cflags: -fno-cse-follow-jumps class: 64-bit PA-RISC override-host-type: hppa64-linux-gnu -[parisc64-smp] +[parisc64-smp_base] cflags: -fno-cse-follow-jumps class: multiprocessor 64-bit PA-RISC override-host-type: hppa64-linux-gnu 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 Sun Jul 29 16:26:02 2007 @@ -17,32 +17,32 @@ suggests: grub (>= 0.97-3) | lilo (>= 19.1) type: plain -[486] +[486_base] class: x86 longclass: x86 and compatible -[686] +[686_base] class: PPro/Celeron/PII/PIII/P4 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 [686_image] recommends: libc6-i686 -[686-bigmem] +[686-bigmem_base] class: PPro/Celeron/PII/PIII/P4 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM [686-bigmem_image] recommends: libc6-i686 -[k7] +[k7_base] class: AMD K7 longclass: 32bit AMD Duron/Athlon/AthlonXP/Sempron [k7_image] recommends: libc6-i686 -[amd64] +[amd64_base] class: AMD64 kernel-arch: x86_64 longclass: all 64bit single- and multiprocessor AMD and Intel Modified: dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines (original) +++ dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines Sun Jul 29 16:26:02 2007 @@ -16,7 +16,7 @@ [xen] flavour: i386-pae -[686] +[686_base] class: i686 longclass: i686 and compatible Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/xen/defines (original) +++ dists/trunk/linux-2.6/debian/config/i386/xen/defines Sun Jul 29 16:26:02 2007 @@ -15,7 +15,7 @@ [xen] flavour: i386-pae -[686] +[686_base] class: i686 longclass: i686 and compatible 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 Sun Jul 29 16:26:02 2007 @@ -10,8 +10,8 @@ [image] suggests: elilo, fdutils -[itanium] +[itanium_base] class: Itanium -[mckinley] +[mckinley_base] class: Itanium II 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 Sun Jul 29 16:26:02 2007 @@ -18,30 +18,30 @@ suggests: vmelilo, fdutils type: plain -[amiga] +[amiga_base] class: Amiga -[atari] +[atari_base] class: Atari -[bvme6000] +[bvme6000_base] class: BVM BVME4000 and BVME6000 -[hp] +[hp_base] class: HP -[mac] +[mac_base] class: Macintosh -[mvme147] +[mvme147_base] class: Motorola MVME147 -[mvme16x] +[mvme16x_base] class: Motorola MVME162/6/7, MVME172/7 -[q40] +[q40_base] class: Q40 and Q60 -[sun3] +[sun3_base] class: sun3 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 Sun Jul 29 16:26:02 2007 @@ -12,26 +12,26 @@ [image] initramfs: false -[r4k-ip22] +[r4k-ip22_base] class: SGI IP22 longclass: SGI IP22 (Indy, Indigo2) -[r5k-ip32] +[r5k-ip32_base] class: SGI IP32 longclass: SGI IP32 (O2) -[sb1-bcm91250a] +[sb1-bcm91250a_base] class: BCM91250A longclass: Broadcom BCM91250A (aka SWARM) -[sb1a-bcm91480b] +[sb1a-bcm91480b_base] class: BCM91480B longclass: Broadcom BCM91480B (aka BigSur) -[4kc-malta] +[4kc-malta_base] class: MIPS Malta longclass: MIPS Malta board -[qemu] +[qemu_base] class: QEMU longclass: QEMU virtual machine 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 Sun Jul 29 16:26:02 2007 @@ -11,22 +11,22 @@ [image] initramfs: false -[r5k-cobalt] +[r5k-cobalt_base] class: Cobalt longclass: Cobalt (Qube, RaQ, Qube2, RaQ2) -[sb1-bcm91250a] +[sb1-bcm91250a_base] class: BCM91250A longclass: Broadcom BCM91250A (aka SWARM) -[sb1a-bcm91480b] +[sb1a-bcm91480b_base] class: BCM91480B longclass: Broadcom BCM91480B (aka BigSur) -[4kc-malta] +[4kc-malta_base] class: MIPS Malta longclass: MIPS Malta board -[qemu] +[qemu_base] class: QEMU longclass: QEMU virtual machine 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 Sun Jul 29 16:26:02 2007 @@ -15,28 +15,28 @@ [image] type: plain -[apus] +[apus_base] depends: mkvmlinuz (>= 24) kernel-arch: ppc -[prep] +[prep_base] class: PReP PowerPC depends: mkvmlinuz (>= 24) kernel-arch: ppc kpkg-subarch: prep -[powerpc] +[powerpc_base] class: uniprocessor 32-bit PowerPC depends: mkvmlinuz (>= 24) -[powerpc-smp] +[powerpc-smp_base] class: multiprocessor 32-bit PowerPC depends: mkvmlinuz (>= 24) -[powerpc-miboot] +[powerpc-miboot_base] class: 32-bit PowerPC for miboot floppy depends: mkvmlinuz (>= 24) -[powerpc64] +[powerpc64_base] class: 64-bit PowerPC kpkg-subarch: powerpc64 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 Sun Jul 29 16:26:02 2007 @@ -13,10 +13,10 @@ suggests: s390-tools type: plain -[s390] +[s390_base] class: IBM S/390 -[s390-tape] +[s390-tape_base] class: IBM S/390 tape modules: false @@ -25,6 +25,6 @@ initramfs: false type: plain-s390-tape -[s390x] +[s390x_base] class: IBM zSeries 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 Sun Jul 29 16:26:02 2007 @@ -10,7 +10,7 @@ [image] suggests: silo, fdutils -[sparc32] +[sparc32_base] class: uniprocessor sparc32 (sun4m) kernel-arch: sparc kpkg-subarch: sparc @@ -18,12 +18,12 @@ [sparc32_image] image-postproc: sparc32-image-postproc -[sparc64] +[sparc64_base] class: uniprocessor 64-bit UltraSPARC kernel-arch: sparc64 kpkg-subarch: sparc64 -[sparc64-smp] +[sparc64-smp_base] class: multiprocessor 64-bit UltraSPARC kernel-arch: sparc64 kpkg-subarch: sparc64 _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

