[kernel] r14469 - in dists/trunk/linux-2.6/debian: bin config config/alpha config/alpha/vserver config/amd64 config/armel config/featureset-openvz config/featureset-vserver config/featureset-xen config/hppa config/i386 config/i386/openvz config/i386/xen config/ia64 config/m68k config/mips config/mipsel config/powerpc config/s390 config/sparc lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Tue Oct 27 16:35:17 UTC 2009
Author: waldi
Date: Tue Oct 27 16:35:16 2009
New Revision: 14469
Log:
Move all description related config options into its own section.
* debian/bin/gencontrol.py: Handle description parts.
* debian/config: Update.
* debian/lib/python/debian_linux/config.py: Recognize new section.
* debian/lib/python/debian_linux/gencontrol.py: Remove old code.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
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/armel/defines
dists/trunk/linux-2.6/debian/config/defines
dists/trunk/linux-2.6/debian/config/featureset-openvz/defines
dists/trunk/linux-2.6/debian/config/featureset-vserver/defines
dists/trunk/linux-2.6/debian/config/featureset-xen/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/openvz/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
dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Tue Oct 27 16:35:16 2009 (r14469)
@@ -73,8 +73,12 @@
def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
config_base = self.config.merge('base', arch, featureset, flavour)
+ config_description = self.config.merge('description', arch, featureset, flavour)
config_image = self.config.merge('image', arch, featureset, flavour)
+ vars['class'] = config_description['hardware']
+ vars['longclass'] = config_description.get('hardware-long') or vars['class']
+
vars['localversion-image'] = vars['localversion']
override_localversion = config_image.get('override-localversion', None)
if override_localversion is not None:
@@ -106,6 +110,7 @@
headers = self.templates["control.headers"]
config_entry_base = self.config.merge('base', arch, featureset, flavour)
+ config_entry_description = self.config.merge('description', arch, featureset, flavour)
config_entry_image = self.config.merge('image', arch, featureset, flavour)
config_entry_relations = self.config.merge('relations', arch, featureset, flavour)
@@ -136,12 +141,12 @@
image_fields['Conflicts'].append(PackageRelationGroup([a]))
image_fields['Depends'].append(l_depends)
- desc_parts = self.config.get_merge('image', arch, featureset, flavour, 'desc-parts')
+ desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')
if desc_parts:
desc = image_fields['Description']
for part in desc_parts[::-1]:
- desc.append(config_entry_image['desc-long-part-' + part])
- desc.append_short(config_entry_image.get('desc-short-part-' + part, ''))
+ desc.append(config_entry_description['part-long-' + part])
+ desc.append_short(config_entry_description.get('part-short-' + part, ''))
packages_dummy = []
packages_own = []
Modified: dists/trunk/linux-2.6/debian/config/alpha/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/alpha/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -7,14 +7,14 @@
[image]
suggests: aboot, fdutils
-[alpha-generic_base]
-class: Alpha
-longclass: DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)
+[alpha-generic_description]
+hardware: Alpha
+hardware-long: DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)
-[alpha-smp_base]
-class: Alpha SMP
-longclass: DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel)
+[alpha-smp_description]
+hardware: Alpha SMP
+hardware-long: DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel)
-[alpha-legacy_base]
-class: Alpha Legacy
-longclass: DEC Alpha systems with legacy kernel start address
+[alpha-legacy_description]
+hardware: Alpha Legacy
+hardware-long: DEC Alpha systems with legacy kernel start address
Modified: dists/trunk/linux-2.6/debian/config/alpha/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/vserver/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/alpha/vserver/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -1,8 +1,8 @@
[base]
flavours: alpha
-[alpha_base]
-class: Alpha
+[alpha_description]
+hardware: Alpha
[alpha_image]
configs: alpha/config.alpha-generic
Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -13,12 +13,12 @@
amd64/config
suggests: grub | lilo
-[amd64_base]
-class: 64-bit PCs
-longclass: PCs with AMD64 or Intel 64 processors
+[amd64_description]
+hardware: 64-bit PCs
+hardware-long: PCs with AMD64 or Intel 64 processors
+parts: xen
[amd64_image]
configs:
kernelarch-x86/config-arch-64
amd64/config.amd64
-desc-parts: xen
Modified: dists/trunk/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/armel/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -10,48 +10,48 @@
[image]
suggests: fdutils
-[iop32x_base]
-class: IOP32x
-longclass: IOP32x based systems (Thecus N2100, etc)
-
[iop32x_build]
image-file: arch/arm/boot/zImage
+[iop32x_description]
+hardware: IOP32x
+hardware-long: IOP32x based systems (Thecus N2100, etc)
+
[iop32x_image]
# Thecus N2100: 1441792 - 8 = 1441784
check-size: 1441784
-[ixp4xx_base]
-class: IXP4xx
-longclass: IXP4xx based systems (Linksys NSLU2, etc)
-
[ixp4xx_build]
image-file: arch/arm/boot/zImage
+[ixp4xx_description]
+hardware: IXP4xx
+hardware-long: IXP4xx based systems (Linksys NSLU2, etc)
+
[ixp4xx_image]
# Linksys NSLU2: 1441792 - 16 - 16 = 1441760
check-size: 1441760
-[kirkwood_base]
-class: Marvell Kirkwood
-longclass: Marvell Kirkwood based systems (SheevaPlug, QNAP TS-119/TS-219, etc)
-
[kirkwood_build]
image-file: arch/arm/boot/zImage
+[kirkwood_description]
+hardware: Marvell Kirkwood
+hardware-long: Marvell Kirkwood based systems (SheevaPlug, QNAP TS-119/TS-219, etc)
+
[kirkwood_image]
recommends: uboot-mkimage
# SheevaPlug: 4194304 - 8 - 64 = 4194232
# QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
check-size: 2097080
-[orion5x_base]
-class: Marvell Orion
-longclass: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-209, etc)
-
[orion5x_build]
image-file: arch/arm/boot/zImage
+[orion5x_description]
+hardware: Marvell Orion
+hardware-long: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-209, etc)
+
[orion5x_image]
recommends: uboot-mkimage
# D-Link DNS-323: 1572864 - 8 - 64 = 1572792
@@ -59,6 +59,6 @@
# QNAP TS-109/TS-209 & TS-409: 2097152 - 8 - 64 = 2097080
check-size: 1572792
-[versatile_base]
-class: Versatile
-longclass: Versatile systems (PB, AB, Qemu)
+[versatile_description]
+hardware: Versatile
+hardware-long: Versatile systems (PB, AB, Qemu)
Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -31,9 +31,11 @@
[featureset-xen_base]
enabled: false
-[image]
-desc-long-part-xen: This kernel also runs on a Xen hypervisor.
+[description]
+part-long-xen: This kernel also runs on a Xen hypervisor.
It supports only unprivileged (domU) operation.
+
+[image]
initramfs-generators: initramfs-tools initramfs-fallback
type: plain
Modified: dists/trunk/linux-2.6/debian/config/featureset-openvz/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/featureset-openvz/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/featureset-openvz/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -1,6 +1,7 @@
+[description]
+part-long-openvz: This kernel includes support for OpenVZ container-based virtualization.
+part-short-openvz: OpenVZ support
+parts: openvz
+
[image]
depends: vzctl
-desc-long-part-openvz: This kernel includes support for OpenVZ container-based virtualization.
-desc-parts: openvz
-desc-short-part-openvz: OpenVZ support
-
Modified: dists/trunk/linux-2.6/debian/config/featureset-vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/featureset-vserver/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/featureset-vserver/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -1,5 +1,7 @@
+[description]
+part-long-vserver: This kernel includes support for Linux-VServer virtualization.
+part-short-vserver: Linux-VServer support
+parts: vserver
+
[image]
-desc-long-part-vserver: This kernel includes support for Linux-VServer virtualization.
-desc-parts: vserver
-desc-short-part-vserver: Linux-VServer support
recommends: util-vserver
Modified: dists/trunk/linux-2.6/debian/config/featureset-xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/featureset-xen/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/featureset-xen/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -1,5 +1,5 @@
-[image]
-desc-long-part-xenold: This kernel only runs on a Xen hypervisor.
+[description]
+part-long-xenold: This kernel only runs on a Xen hypervisor.
It supports both privileged (dom0) and unprivileged (domU) operation.
-desc-parts: xenold
-desc-short-part-xenold: oldstyle Xen support
+part-short-xenold: oldstyle Xen support
+parts: xenold
Modified: dists/trunk/linux-2.6/debian/config/hppa/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/hppa/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -9,22 +9,26 @@
[image]
suggests: palo
-[parisc_base]
-class: 32-bit PA-RISC
+[parisc_description]
+hardware: 32-bit PA-RISC
-[parisc-smp_base]
-class: multiprocessor 32-bit PA-RISC
+[parisc-smp_description]
+hardware: multiprocessor 32-bit PA-RISC
[parisc64_base]
cflags: -fno-cse-follow-jumps
-class: 64-bit PA-RISC
override-host-type: hppa64-linux-gnu
+[parisc64_description]
+hardware: 64-bit PA-RISC
+
[parisc64-smp_base]
cflags: -fno-cse-follow-jumps
-class: multiprocessor 64-bit PA-RISC
override-host-type: hppa64-linux-gnu
+[parisc64-smp_description]
+hardware: multiprocessor 64-bit PA-RISC
+
[relations]
gcc-4.3: gcc-4.3, binutils-hppa64, gcc-4.3-hppa64
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -16,42 +16,42 @@
i386/config
suggests: grub | lilo
-[486_base]
-class: old PCs
-longclass: PCs with a 486, Pentium or compatible processor
+[486_description]
+hardware: old PCs
+hardware-long: PCs with a 486, Pentium or compatible processor
[486_image]
configs:
kernelarch-x86/config-arch-32
-[686_base]
-class: modern PCs
-longclass: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
+[686_description]
+hardware: modern PCs
+hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
[686_image]
configs:
kernelarch-x86/config-arch-32
recommends: libc6-i686
-[686-bigmem_base]
-class: PCs with 4GB+ RAM
-longclass: PCs with 4-64GB RAM, using PAE (Physical Address Extension)
+[686-bigmem_description]
+hardware: PCs with 4GB+ RAM
+hardware-long: PCs with 4-64GB RAM, using PAE (Physical Address Extension)
+parts: xen
[686-bigmem_image]
configs:
kernelarch-x86/config-arch-32
-desc-parts: xen
recommends: libc6-i686
-[amd64_base]
-class: 64-bit PCs
-longclass: PCs with AMD64 or Intel 64 processors
+[amd64_description]
+hardware: 64-bit PCs
+hardware-long: PCs with AMD64 or Intel 64 processors
+parts: xen
[amd64_image]
configs:
kernelarch-x86/config-arch-64
amd64/config
amd64/config.amd64
-desc-parts: xen
recommends: libc6-i686
Modified: dists/trunk/linux-2.6/debian/config/i386/openvz/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/openvz/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/i386/openvz/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -2,8 +2,10 @@
flavours:
686
+[686_description]
+parts: xen
+
[686_image]
configs:
i386/config.686-bigmem
-desc-parts: xen
Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -12,9 +12,9 @@
i386
amd64
-[686_base]
-class: modern PCs
-longclass: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core, Atom; AMD K6, Athlon, Duron, Opteron, Sempron, Turion, Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
+[686_description]
+hardware: modern PCs
+hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core, Atom; AMD K6, Athlon, Duron, Opteron, Sempron, Turion, Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
[686_image]
configs:
Modified: dists/trunk/linux-2.6/debian/config/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/ia64/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -9,8 +9,8 @@
[image]
suggests: elilo, fdutils
-[itanium_base]
-class: Itanium
+[itanium_description]
+hardware: Itanium
-[mckinley_base]
-class: Itanium II
+[mckinley_description]
+hardware: Itanium II
Modified: dists/trunk/linux-2.6/debian/config/m68k/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/m68k/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -16,30 +16,30 @@
initramfs: false
suggests: vmelilo, fdutils
-[amiga_base]
-class: Amiga
+[amiga_description]
+hardware: Amiga
-[atari_base]
-class: Atari
+[atari_description]
+hardware: Atari
-[bvme6000_base]
-class: BVM BVME4000 and BVME6000
+[bvme6000_description]
+hardware: BVM BVME4000 and BVME6000
-[hp_base]
-class: HP
+[hp_description]
+hardware: HP
-[mac_base]
-class: Macintosh
+[mac_description]
+hardware: Macintosh
-[mvme147_base]
-class: Motorola MVME147
+[mvme147_description]
+hardware: Motorola MVME147
-[mvme16x_base]
-class: Motorola MVME162/6/7, MVME172/7
+[mvme16x_description]
+hardware: Motorola MVME162/6/7, MVME172/7
-[q40_base]
-class: Q40 and Q60
+[q40_description]
+hardware: Q40 and Q60
-[sun3_base]
-class: sun3
+[sun3_description]
+hardware: sun3
Modified: dists/trunk/linux-2.6/debian/config/mips/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/mips/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -11,26 +11,26 @@
[image]
initramfs: false
-[r4k-ip22_base]
-class: SGI IP22
-longclass: SGI IP22 systems (Indy, Indigo2)
-
-[r5k-ip32_base]
-class: SGI IP32
-longclass: SGI IP32 systems (O2)
-
-[sb1-bcm91250a_base]
-class: BCM91250A
-longclass: Broadcom BCM91250A systems (aka SWARM)
-
-[sb1a-bcm91480b_base]
-class: BCM91480B
-longclass: Broadcom BCM91480B systems (aka BigSur)
-
-[4kc-malta_base]
-class: MIPS Malta
-longclass: MIPS Malta boards
-
-[5kc-malta_base]
-class: MIPS Malta (64-bit)
-longclass: MIPS Malta boards (64-bit)
+[r4k-ip22_description]
+hardware: SGI IP22
+hardware-long: SGI IP22 systems (Indy, Indigo2)
+
+[r5k-ip32_description]
+hardware: SGI IP32
+hardware-long: SGI IP32 systems (O2)
+
+[sb1-bcm91250a_description]
+hardware: BCM91250A
+hardware-long: Broadcom BCM91250A systems (aka SWARM)
+
+[sb1a-bcm91480b_description]
+hardware: BCM91480B
+hardware-long: Broadcom BCM91480B systems (aka BigSur)
+
+[4kc-malta_description]
+hardware: MIPS Malta
+hardware-long: MIPS Malta boards
+
+[5kc-malta_description]
+hardware: MIPS Malta (64-bit)
+hardware-long: MIPS Malta boards (64-bit)
Modified: dists/trunk/linux-2.6/debian/config/mipsel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/mipsel/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -10,22 +10,22 @@
[image]
initramfs: false
-[r5k-cobalt_base]
-class: Cobalt
-longclass: Cobalt systems (Qube, RaQ, Qube2, RaQ2)
+[r5k-cobalt_description]
+hardware: Cobalt
+hardware-long: Cobalt systems (Qube, RaQ, Qube2, RaQ2)
-[sb1-bcm91250a_base]
-class: BCM91250A
-longclass: Broadcom BCM91250A systems (aka SWARM)
+[sb1-bcm91250a_description]
+hardware: BCM91250A
+hardware-long: Broadcom BCM91250A systems (aka SWARM)
-[sb1a-bcm91480b_base]
-class: BCM91480B
-longclass: Broadcom BCM91480B systems (aka BigSur)
+[sb1a-bcm91480b_description]
+hardware: BCM91480B
+hardware-long: Broadcom BCM91480B systems (aka BigSur)
-[4kc-malta_base]
-class: MIPS Malta
-longclass: MIPS Malta boards
+[4kc-malta_description]
+hardware: MIPS Malta
+hardware-long: MIPS Malta boards
-[5kc-malta_base]
-class: MIPS Malta (64-bit)
-longclass: MIPS Malta boards (64-bit)
+[5kc-malta_description]
+hardware: MIPS Malta (64-bit)
+hardware-long: MIPS Malta boards (64-bit)
Modified: dists/trunk/linux-2.6/debian/config/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/powerpc/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -10,14 +10,14 @@
[image]
suggests: mkvmlinuz
-[powerpc_base]
-class: uniprocessor 32-bit PowerPC
+[powerpc_description]
+hardware: uniprocessor 32-bit PowerPC
-[powerpc-smp_base]
-class: multiprocessor 32-bit PowerPC
+[powerpc-smp_description]
+hardware: multiprocessor 32-bit PowerPC
[powerpc-smp_image]
configs: powerpc/config.powerpc powerpc/config.powerpc-smp
-[powerpc64_base]
-class: 64-bit PowerPC
+[powerpc64_description]
+hardware: 64-bit PowerPC
Modified: dists/trunk/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/s390/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -6,41 +6,43 @@
s390x-tape
kernel-arch: s390
+[description]
+part-long-reader: This kernel has support to IPL (boot) from a VM reader or DASD device.
+part-long-tape: This kernel has support to IPL (boot) from a tape.
+part-short-tape: IPL from tape
+
[image]
-desc-long-part-reader: This kernel has support to IPL (boot) from a VM reader or DASD device.
-desc-long-part-tape: This kernel has support to IPL (boot) from a tape.
-desc-short-part-tape: IPL from tape
suggests: s390-tools
-[s390_base]
-class: IBM S/390
-
-[s390_image]
-desc-parts: reader
+[s390_description]
+hardware: IBM S/390
+parts: reader
[s390-tape_base]
-class: IBM S/390
modules: false
+[s390-tape_description]
+hardware: IBM S/390
+parts: tape
+
[s390-tape_image]
initramfs: false
-desc-parts: tape
override-localversion: s390
type: plain-s390-tape
-[s390x_base]
-class: IBM zSeries
-
-[s390x_image]
-desc-parts: reader
+[s390x_description]
+hardware: IBM zSeries
+parts: reader
[s390x-tape_base]
-class: IBM zSeries
modules: false
+[s390x-tape_description]
+hardware: IBM zSeries
+parts: tape
+
[s390x-tape_image]
initramfs: false
-desc-parts: tape
override-localversion: s390x
type: plain-s390-tape
Modified: dists/trunk/linux-2.6/debian/config/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/defines Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/config/sparc/defines Tue Oct 27 16:35:16 2009 (r14469)
@@ -9,15 +9,15 @@
[image]
suggests: silo, fdutils
-[sparc32_base]
-class: uniprocessor sparc32 (sun4m)
+[sparc32_description]
+hardware: uniprocessor sparc32 (sun4m)
[sparc32_image]
image-postproc: sparc32-image-postproc
-[sparc64_base]
-class: uniprocessor 64-bit UltraSPARC
+[sparc64_description]
+hardware: uniprocessor 64-bit UltraSPARC
-[sparc64-smp_base]
-class: multiprocessor 64-bit UltraSPARC
+[sparc64-smp_description]
+hardware: multiprocessor 64-bit UltraSPARC
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Tue Oct 27 16:35:16 2009 (r14469)
@@ -113,9 +113,11 @@
'modules': SchemaItemBoolean(),
},
'build': {},
+ 'description': {
+ 'parts': SchemaItemList(),
+ },
'image': {
'configs': SchemaItemList(),
- 'desc-parts': SchemaItemList(),
'initramfs': SchemaItemBoolean(),
'initramfs-generators': SchemaItemList(),
},
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Tue Oct 27 13:21:06 2009 (r14468)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Tue Oct 27 16:35:16 2009 (r14469)
@@ -207,9 +207,6 @@
def do_flavour(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
config_base = self.config.merge('base', arch, featureset, flavour)
- vars['class'] = config_base['class']
- vars['longclass'] = config_base.get('longclass') or vars['class']
-
vars['localversion'] += '-' + flavour
self.do_flavour_setup(vars, makeflags, arch, featureset, flavour, extra)
More information about the Kernel-svn-changes
mailing list