[kernel] r6007 - 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/s390
arch/sparc bin lib/python/debian_linux
Bastian Blank
waldi at costa.debian.org
Thu Mar 2 10:41:02 UTC 2006
Author: waldi
Date: Thu Mar 2 10:41:01 2006
New Revision: 6007
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/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/gencontrol.py
Log:
* debian/arch/defines, 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/s390/defines,
debian/arch/sparc/defines: Move image specific specs into image section.
* debian/bin/gencontrol.py: Use image section if neccesary.
* debian/lib/python/debian_linux/gencontrol.py: Support image section.
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 10:41:01 2006
@@ -1,11 +1,12 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool
flavours: alpha-generic alpha-smp alpha-legacy
-suggests: aboot, fdutils
-
kernel-arch: alpha
kernel-header-dirs: alpha
+[image]
+depends: initramfs-tools | yaird | linux-initramfs-tool
+suggests: aboot, fdutils
+
[alpha-generic]
class = Alpha
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool, e2fsprogs (>= 1.35-7)
flavours:
amd64-generic
amd64-k8
@@ -9,6 +8,9 @@
kernel-arch: x86_64
kernel-header-dirs: x86_64
subarches: vserver
+
+[image]
+depends: initramfs-tools | yaird | linux-initramfs-tool, 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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: yaird | initramfs-tools | linux-initramfs-tool
flavours:
footbridge
ixp4xx
@@ -8,6 +7,9 @@
s3c2410
kernel-arch: arm
kernel-header-dirs: arm
+
+[image]
+depends: yaird | initramfs-tools | linux-initramfs-tool
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 10:41:01 2006
@@ -1,10 +1,12 @@
[base]
-depends: yaird | initramfs-tools | linux-initramfs-tool
flavours:
nslu2
kernel-arch: arm
kernel-header-dirs: arm
+[image]
+depends: yaird | initramfs-tools | linux-initramfs-tool
+
[nslu2]
class: NSLU2
longclass: Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives)
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 10:41:01 2006
@@ -1,5 +1,7 @@
-[base]
+[abiname]
abiname: 1
+
+[base]
arches:
alpha
amd64
@@ -14,7 +16,9 @@
powerpc
s390
sparc
-image-ramdisk-generators: yaird initramfs-tools
+
+[image]
+ramdisk-generators: yaird initramfs-tools
type: kernel-package
[image-ramdisk-generators]
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
parisc
parisc-smp
@@ -7,6 +6,9 @@
parisc64-smp
kernel-arch: parisc
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
486
686
@@ -9,25 +8,36 @@
kernel-arch: i386
kernel-header-dirs: i386
subarches: vserver
+
+[image]
+depends: initramfs-tools | yaird | linux-initramfs-tool
suggests: grub | lilo (>= 19.1)
[686]
class: PPro/Celeron/PII/PIII/P4
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+
+[686_image]
recommends: libc6-i686
[686-smp]
class: PPro/Celeron/PII/PIII/P4 SMP
longclass: multi-processor Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+
+[686-smp_image]
recommends: libc6-i686
[k7]
class: AMD K7
longclass: 32bit AMD Duron/Athlon/AthlonXP
+
+[k7_image]
recommends: libc6-i686
[k7-smp]
class: AMD K7 SMP
longclass: 32-bit multi-processor AMD Duron/Athlon/AthlonXP
+
+[k7-smp_image]
recommends: libc6-i686
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
itanium
itanium-smp
@@ -7,6 +6,9 @@
mckinley-smp
kernel-arch: ia64
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: yaird | initramfs-tools | linux-initramfs-tool
compiler: gcc-3.3
flavours:
amiga
@@ -13,6 +12,9 @@
sun3
kernel-arch: m68k
kernel-header-dirs: m68k
+
+[image]
+depends: yaird | initramfs-tools | linux-initramfs-tool
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-initrd: false
flavours:
r4k-ip22
r5k-ip32
@@ -7,6 +6,9 @@
kernel-arch: mips
kernel-header-dirs: mips
+[image]
+initrd: false
+
[r4k-ip22]
class: SGI IP22
longclass: SGI IP22 (Indy, Indigo2)
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 10:41:01 2006
@@ -1,11 +1,13 @@
[base]
-initrd: false
flavours:
r5k-cobalt
sb1-bcm91250a
kernel-arch: mips
kernel-header-dirs: mips
+[image]
+initrd: false
+
[r5k-cobalt]
class: Cobalt
longclass: Cobalt (Qube, RaQ, Qube2, RaQ2)
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 10:41:01 2006
@@ -1,5 +1,4 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
powerpc
powerpc-smp
@@ -10,6 +9,9 @@
kpkg-subarch: ppc
subarches: vserver
+[image]
+depends: initramfs-tools | yaird | linux-initramfs-tool
+
[apus]
depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
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 10:41:01 2006
@@ -1,11 +1,13 @@
[base]
-desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
-depends: yaird | initramfs-tools | linux-initramfs-tool
flavours: s390 s390x
-suggests: s390-tools
kernel-arch: s390
kernel-header-dirs: s390
+[image]
+desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
+depends: yaird | initramfs-tools | linux-initramfs-tool
+suggests: s390-tools
+
[s390]
class: IBM S/390
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 10:41:01 2006
@@ -1,18 +1,22 @@
[base]
-depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
sparc32
sparc64
sparc64-smp
+
+[image]
+depends: initramfs-tools | yaird | linux-initramfs-tool
suggests: silo, fdutils
[sparc32]
kernel-arch: sparc
kernel-subarch: sparc
kernel-headers-dirs: sparc
-image-postproc: sparc32-image-postproc
class: uniprocessor sparc32 (sun4m) machines
+[sparc32_image]
+image-postproc: sparc32-image-postproc
+
[sparc64]
kernel-arch: sparc64
kpkg-subarch: sparc64
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 10:41:01 2006
@@ -37,8 +37,6 @@
def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
- # Append this here so it only occurs on the install-headers-all line
-# makeflags_string += " FLAVOURS='%s' " % ' '.join(['%s' % i for i in config_entry['flavours']])
cmds_binary_arch = []
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(extra['headers_arch_depends']), makeflags_string),))
makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
@@ -77,6 +75,7 @@
def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
config_entry = self.config.merge('base', arch, subarch, flavour)
+ config_entry.update(self.config.merge('image', arch, subarch, flavour))
for i in (
('compiler', 'COMPILER'),
('kernel-arch', 'KERNEL_ARCH'),
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 10:41:01 2006
@@ -88,6 +88,7 @@
def do_arch(self, packages, makefile, arch, vars, makeflags):
config_entry = self.config['base', arch]
vars.update(config_entry)
+ vars.update(self.config['image', arch])
if not config_entry.get('available', True):
for i in ('binary-arch', 'build', 'setup'):
@@ -96,6 +97,7 @@
extra = {}
makeflags['ARCH'] = arch
+
vars['localversion'] = vars['localversion_headers'] = vars['abiname']
self.do_arch_makeflags(makeflags, arch)
@@ -124,6 +126,7 @@
def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
config_entry = self.config['base', arch, subarch]
vars.update(config_entry)
+ vars.update(self.config.get(('image', arch, subarch), {}))
makeflags['SUBARCH'] = subarch
if subarch != 'none':
@@ -152,8 +155,8 @@
def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
config_entry = self.config['base', arch, subarch, flavour]
vars.update(config_entry)
+ vars.update(self.config.get(('image', arch, subarch, flavour), {}))
- vars['flavour'] = flavour
if not vars.has_key('class'):
warnings.warn('No class entry in config for flavour %s, subarch %s, arch %s' % (flavour, subarch, arch), DeprecationWarning)
vars['class'] = '%s-class' % flavour
@@ -201,7 +204,7 @@
if version['modifier'] is not None:
ret[1] = vars['abiname'] = ''
else:
- ret[1] = vars['abiname'] = '-%s' % self.config['base',]['abiname']
+ ret[1] = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
vars['upstreamversion'] = version['upstream']
vars['version'] = version['version']
vars['major'] = version['major']
More information about the Kernel-svn-changes
mailing list