2006-01-04 19:33:32 +00:00
|
|
|
#!/usr/bin/env python2.4
|
2006-11-19 11:04:25 +00:00
|
|
|
import os, sys
|
2005-08-21 15:17:11 +00:00
|
|
|
sys.path.append("debian/lib/python")
|
2007-06-17 10:34:22 +00:00
|
|
|
|
|
|
|
from debian_linux.gencontrol import Gencontrol as Base
|
2006-01-06 22:32:16 +00:00
|
|
|
from debian_linux.debian import *
|
2005-08-07 15:29:32 +00:00
|
|
|
|
2007-06-17 10:34:22 +00:00
|
|
|
class Gencontrol(Base):
|
2006-04-09 21:17:21 +00:00
|
|
|
def __init__(self):
|
2007-06-17 10:34:22 +00:00
|
|
|
super(Gencontrol, self).__init__()
|
2006-04-14 16:12:41 +00:00
|
|
|
self.process_changelog()
|
2006-04-09 21:17:21 +00:00
|
|
|
|
2006-06-24 11:39:08 +00:00
|
|
|
def do_main_setup(self, vars, makeflags, extra):
|
2007-06-17 10:34:22 +00:00
|
|
|
super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
vars.update(self.config['image',])
|
2006-08-29 09:53:31 +00:00
|
|
|
makeflags.update({
|
2007-01-27 20:56:56 +00:00
|
|
|
'SOURCEVERSION': self.version.complete,
|
2006-08-29 09:53:31 +00:00
|
|
|
})
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
|
2006-06-24 11:39:08 +00:00
|
|
|
def do_main_packages(self, packages, extra):
|
2006-08-29 09:53:31 +00:00
|
|
|
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
|
|
|
|
packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars))
|
|
|
|
packages.extend(self.process_packages(self.templates["control.support"], self.vars))
|
2006-04-02 20:43:04 +00:00
|
|
|
|
2006-06-24 11:39:08 +00:00
|
|
|
def do_arch_setup(self, vars, makeflags, arch, extra):
|
2006-03-10 19:22:23 +00:00
|
|
|
vars.update(self.config.get(('image', arch), {}))
|
|
|
|
|
2006-01-04 19:33:32 +00:00
|
|
|
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
|
|
|
headers_arch = self.templates["control.headers.arch"]
|
2006-03-28 21:48:15 +00:00
|
|
|
packages_headers_arch = self.process_packages(headers_arch, vars)
|
2006-04-02 20:22:53 +00:00
|
|
|
|
2007-06-17 10:51:18 +00:00
|
|
|
extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = PackageRelation()
|
* Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
debian/arch/$arch/$subarch/defines and
debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.
r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
- Use new gencontrol.
- Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.
r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.
r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/i386/defines.686,
debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
Remove
r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines: Update.
r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
Update.
r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp,
debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
Delete.
r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
Delete.
r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.
r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.
svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00
|
|
|
|
2006-04-02 20:43:04 +00:00
|
|
|
for package in packages_headers_arch:
|
2006-03-28 21:48:15 +00:00
|
|
|
name = package['Package']
|
|
|
|
if packages.has_key(name):
|
|
|
|
package = packages.get(name)
|
|
|
|
package['Architecture'].append(arch)
|
|
|
|
else:
|
|
|
|
package['Architecture'] = [arch]
|
|
|
|
packages.append(package)
|
* Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
debian/arch/$arch/$subarch/defines and
debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.
r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
- Use new gencontrol.
- Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.
r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.
r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/i386/defines.686,
debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
Remove
r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines: Update.
r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
Update.
r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp,
debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
Delete.
r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
Delete.
r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.
r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.
svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00
|
|
|
|
2006-03-28 21:48:15 +00:00
|
|
|
cmds_binary_arch = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags))
|
2006-03-04 13:48:18 +00:00
|
|
|
cmds_source = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags,))
|
2006-03-28 21:48:15 +00:00
|
|
|
makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
|
2006-01-04 19:33:32 +00:00
|
|
|
makefile.append(("build-%s-real:" % arch))
|
2006-03-04 13:48:18 +00:00
|
|
|
makefile.append(("setup-%s-real:" % arch))
|
|
|
|
makefile.append(("source-%s-real:" % arch, cmds_source))
|
* Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
debian/arch/$arch/$subarch/defines and
debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.
r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
- Use new gencontrol.
- Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.
r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.
r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/i386/defines.686,
debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
Remove
r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines: Update.
r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
Update.
r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp,
debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
Delete.
r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
Delete.
r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.
r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.
svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00
|
|
|
|
2006-06-24 11:39:08 +00:00
|
|
|
def do_subarch_setup(self, vars, makeflags, arch, subarch, extra):
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
vars.update(self.config.get(('image', arch, subarch), {}))
|
2006-03-03 15:58:44 +00:00
|
|
|
vars['localversion_headers'] = vars['localversion']
|
|
|
|
for i in (
|
|
|
|
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
|
|
|
|
('localversion_headers', 'LOCALVERSION_HEADERS'),
|
|
|
|
):
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
if vars.has_key(i[0]):
|
|
|
|
makeflags[i[1]] = vars[i[0]]
|
* Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
debian/arch/$arch/$subarch/defines and
debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.
r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
- Use new gencontrol.
- Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.
r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.
r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/i386/defines.686,
debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
Remove
r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines: Update.
r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
Update.
r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp,
debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
Delete.
r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
Delete.
r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.
r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.
svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00
|
|
|
|
2006-01-04 19:33:32 +00:00
|
|
|
def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
|
|
|
|
headers_subarch = self.templates["control.headers.subarch"]
|
|
|
|
package_headers = self.process_package(headers_subarch[0], vars)
|
2005-08-08 22:15:27 +00:00
|
|
|
|
2006-01-04 19:33:32 +00:00
|
|
|
name = package_headers['Package']
|
2005-08-29 10:09:39 +00:00
|
|
|
if packages.has_key(name):
|
2006-01-04 19:33:32 +00:00
|
|
|
package_headers = packages.get(name)
|
|
|
|
package_headers['Architecture'].append(arch)
|
2005-08-29 10:09:39 +00:00
|
|
|
else:
|
2006-01-04 19:33:32 +00:00
|
|
|
package_headers['Architecture'] = [arch]
|
|
|
|
packages.append(package_headers)
|
|
|
|
|
|
|
|
cmds_binary_arch = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags,))
|
2006-03-04 13:48:18 +00:00
|
|
|
cmds_source = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_source.append(("$(MAKE) -f debian/rules.real source-subarch %s" % makeflags,))
|
2006-01-04 19:33:32 +00:00
|
|
|
makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
|
|
|
|
makefile.append("build-%s-%s-real:" % (arch, subarch))
|
2006-03-04 13:48:18 +00:00
|
|
|
makefile.append(("setup-%s-%s-real:" % (arch, subarch)))
|
|
|
|
makefile.append(("source-%s-%s-real:" % (arch, subarch), cmds_source))
|
2006-01-04 19:33:32 +00:00
|
|
|
|
2006-06-24 11:39:08 +00:00
|
|
|
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
vars.update(self.config.get(('image', arch, subarch, flavour), {}))
|
2006-01-04 19:33:32 +00:00
|
|
|
for i in (
|
2007-06-26 10:27:56 +00:00
|
|
|
('cflags', 'CFLAGS'),
|
2006-01-04 19:33:32 +00:00
|
|
|
('compiler', 'COMPILER'),
|
2006-03-03 15:58:44 +00:00
|
|
|
('image-postproc', 'IMAGE_POSTPROC'),
|
|
|
|
('initramfs', 'INITRAMFS',),
|
2006-02-11 21:53:47 +00:00
|
|
|
('kernel-arch', 'KERNEL_ARCH'),
|
2006-01-04 19:33:32 +00:00
|
|
|
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
|
|
|
|
('kpkg-arch', 'KPKG_ARCH'),
|
|
|
|
('kpkg-subarch', 'KPKG_SUBARCH'),
|
2006-03-03 15:58:44 +00:00
|
|
|
('localversion', 'LOCALVERSION'),
|
2007-01-27 19:52:51 +00:00
|
|
|
('override-host-type', 'OVERRIDE_HOST_TYPE'),
|
2006-01-04 19:33:32 +00:00
|
|
|
('type', 'TYPE'),
|
|
|
|
):
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
if vars.has_key(i[0]):
|
|
|
|
makeflags[i[1]] = vars[i[0]]
|
2006-01-04 19:33:32 +00:00
|
|
|
|
|
|
|
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
|
|
|
|
headers = self.templates["control.headers"]
|
|
|
|
|
2006-06-24 10:53:12 +00:00
|
|
|
config_entry_base = self.config.merge('base', arch, subarch, flavour)
|
2006-04-16 23:53:58 +00:00
|
|
|
config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
|
|
|
|
|
2006-06-24 10:53:12 +00:00
|
|
|
compiler = config_entry_base.get('compiler', 'gcc')
|
2007-06-17 10:51:18 +00:00
|
|
|
relations_compiler = PackageRelation(config_entry_relations[compiler])
|
|
|
|
relations_compiler_build_dep = PackageRelation(config_entry_relations[compiler])
|
2006-06-24 10:53:12 +00:00
|
|
|
for group in relations_compiler_build_dep:
|
|
|
|
for item in group:
|
|
|
|
item.arches = [arch]
|
|
|
|
packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
|
|
|
|
|
2007-01-27 19:52:51 +00:00
|
|
|
image_relations = {
|
2007-06-17 10:51:18 +00:00
|
|
|
'conflicts': PackageRelation(),
|
|
|
|
'depends': PackageRelation(),
|
2007-01-27 19:52:51 +00:00
|
|
|
}
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
if vars.get('initramfs', True):
|
|
|
|
generators = vars['initramfs-generators']
|
2006-03-08 10:30:06 +00:00
|
|
|
config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, subarch, flavour)
|
|
|
|
commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
|
|
|
|
makeflags['INITRD_CMD'] = ' '.join(commands)
|
2007-06-17 10:34:22 +00:00
|
|
|
l_depends = PackageRelationGroup()
|
2007-01-27 19:52:51 +00:00
|
|
|
for i in generators:
|
|
|
|
i = config_entry_relations.get(i, i)
|
|
|
|
l_depends.append(i)
|
2007-06-17 10:51:18 +00:00
|
|
|
a = PackageRelationEntry(i)
|
2007-01-27 19:52:51 +00:00
|
|
|
if a.operator is not None:
|
|
|
|
a.operator = -a.operator
|
2007-06-17 10:34:22 +00:00
|
|
|
image_relations['conflicts'].append(PackageRelationGroup([a]))
|
2007-01-27 19:52:51 +00:00
|
|
|
image_relations['depends'].append(l_depends)
|
r6005: waldi | 2006-03-02 11:06:40 +0100
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* 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.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* 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.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
|
|
|
|
2006-01-04 19:33:32 +00:00
|
|
|
packages_dummy = []
|
2006-08-29 09:53:31 +00:00
|
|
|
packages_own = []
|
2006-03-02 22:24:19 +00:00
|
|
|
|
2006-03-29 22:51:23 +00:00
|
|
|
if vars['type'] == 'plain-s390-tape':
|
2007-01-27 19:52:51 +00:00
|
|
|
image = self.templates["control.image.type-standalone"]
|
|
|
|
build_modules = False
|
2006-03-29 22:51:23 +00:00
|
|
|
elif vars['type'] == 'plain-xen':
|
2007-01-27 19:52:51 +00:00
|
|
|
image = self.templates["control.image.type-modulesextra"]
|
|
|
|
build_modules = True
|
2006-08-29 09:53:31 +00:00
|
|
|
config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
|
2006-09-21 16:11:51 +00:00
|
|
|
p = self.process_packages(self.templates['control.xen-linux-system'], vars)
|
|
|
|
l = package_relation_group()
|
|
|
|
for version in config_entry_xen['versions']:
|
|
|
|
l.append("xen-hypervisor-%s-%s" % (version, config_entry_xen['flavour']))
|
2006-09-27 11:07:10 +00:00
|
|
|
makeflags['XEN_VERSIONS'] = ' '.join(['%s-%s' % (i, config_entry_xen['flavour']) for i in config_entry_xen['versions']])
|
2006-09-21 16:11:51 +00:00
|
|
|
p[0]['Depends'].append(l)
|
|
|
|
packages_dummy.extend(p)
|
2006-03-29 22:51:23 +00:00
|
|
|
else:
|
2007-01-27 19:52:51 +00:00
|
|
|
build_modules = True
|
|
|
|
image = self.templates["control.image.type-%s" % vars['type']]
|
|
|
|
#image = self.templates["control.image.type-modulesinline"]
|
2006-03-02 22:24:19 +00:00
|
|
|
|
2006-09-24 12:00:25 +00:00
|
|
|
if not vars.has_key('desc'):
|
|
|
|
vars['desc'] = None
|
|
|
|
|
2007-01-27 19:52:51 +00:00
|
|
|
packages_own.append(self.process_real_image(image[0], image_relations, config_entry_relations, vars))
|
2006-07-13 10:53:23 +00:00
|
|
|
packages_own.extend(self.process_packages(image[1:], vars))
|
2006-03-29 11:41:51 +00:00
|
|
|
|
2007-01-27 19:52:51 +00:00
|
|
|
if build_modules:
|
2006-03-29 22:51:23 +00:00
|
|
|
makeflags['MODULES'] = True
|
2006-06-24 10:53:12 +00:00
|
|
|
package_headers = self.process_package(headers[0], vars)
|
|
|
|
package_headers['Depends'].extend(relations_compiler)
|
|
|
|
packages_own.append(package_headers)
|
2006-03-29 11:41:51 +00:00
|
|
|
extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])
|
2006-01-04 19:33:32 +00:00
|
|
|
|
|
|
|
for package in packages_own + packages_dummy:
|
|
|
|
name = package['Package']
|
|
|
|
if packages.has_key(name):
|
|
|
|
package = packages.get(name)
|
|
|
|
package['Architecture'].append(arch)
|
|
|
|
else:
|
|
|
|
package['Architecture'] = [arch]
|
|
|
|
packages.append(package)
|
|
|
|
|
2006-08-29 09:53:31 +00:00
|
|
|
if vars['type'] == 'plain-xen':
|
|
|
|
for i in ('postinst', 'postrm', 'prerm'):
|
|
|
|
j = self.substitute(self.templates["image.xen.%s" % i], vars)
|
|
|
|
file("debian/%s.%s" % (packages_own[0]['Package'], i), 'w').write(j)
|
2006-01-04 19:33:32 +00:00
|
|
|
|
2006-09-21 18:14:35 +00:00
|
|
|
def get_config(default, *entry_name):
|
|
|
|
entry_real = ('image',) + entry_name
|
|
|
|
entry = self.config.get(entry_real, None)
|
|
|
|
if entry is None:
|
|
|
|
return default
|
|
|
|
configs = entry.get('configs', None)
|
|
|
|
if configs is None:
|
|
|
|
return default
|
|
|
|
return configs
|
|
|
|
|
|
|
|
kconfig = ['config']
|
|
|
|
kconfig.extend(get_config(["%s/config" % arch], arch))
|
|
|
|
if subarch == 'none':
|
|
|
|
kconfig.extend(get_config(["%s/config.%s" % (arch, flavour)], arch, subarch, flavour))
|
|
|
|
else:
|
|
|
|
kconfig.extend(get_config(["%s/%s/config" % (arch, subarch)], arch, subarch))
|
|
|
|
kconfig.extend(get_config(["%s/%s/config.%s" % (arch, subarch, flavour)], arch, subarch, flavour))
|
|
|
|
makeflags['KCONFIG'] = ' '.join(kconfig)
|
|
|
|
|
2006-01-04 19:33:32 +00:00
|
|
|
cmds_binary_arch = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
|
|
|
|
if packages_dummy:
|
|
|
|
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags),))
|
2006-01-04 19:33:32 +00:00
|
|
|
cmds_build = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags,))
|
2006-01-04 19:33:32 +00:00
|
|
|
cmds_setup = []
|
2006-08-29 09:53:31 +00:00
|
|
|
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags,))
|
2006-01-04 19:33:32 +00:00
|
|
|
makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
|
|
|
|
makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
|
|
|
|
makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
|
2006-03-04 13:48:18 +00:00
|
|
|
makefile.append(("source-%s-%s-%s-real:" % (arch, subarch, flavour)))
|
2006-01-04 19:33:32 +00:00
|
|
|
|
2006-08-29 09:53:31 +00:00
|
|
|
def do_extra(self, packages, makefile):
|
|
|
|
apply = self.templates['patch.apply']
|
|
|
|
unpatch = self.templates['patch.unpatch']
|
|
|
|
|
|
|
|
vars = {
|
2007-01-27 20:56:56 +00:00
|
|
|
'home': '/usr/src/kernel-patches/all/%s/debian' % self.version.linux_upstream,
|
2007-01-27 21:20:16 +00:00
|
|
|
'revisions': ' '.join([i.version.debian for i in self.changelog[::-1]]),
|
2007-01-27 20:56:56 +00:00
|
|
|
'source': "%(linux_upstream)s-%(debian)s" % self.version.__dict__,
|
|
|
|
'upstream': self.version.linux_upstream,
|
2006-08-29 09:53:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
apply = self.substitute(apply, vars)
|
|
|
|
unpatch = self.substitute(unpatch, vars)
|
|
|
|
|
2006-09-08 08:30:49 +00:00
|
|
|
file('debian/bin/patch.apply', 'w').write(apply)
|
|
|
|
file('debian/bin/patch.unpatch', 'w').write(unpatch)
|
2006-08-29 09:53:31 +00:00
|
|
|
|
2006-04-14 16:07:56 +00:00
|
|
|
def process_changelog(self):
|
2007-01-27 21:20:16 +00:00
|
|
|
in_changelog = Changelog(version = VersionLinux)
|
|
|
|
act_upstream = in_changelog[0].version.linux_upstream
|
2007-01-27 19:52:51 +00:00
|
|
|
changelog = []
|
|
|
|
for i in in_changelog:
|
2007-01-27 21:20:16 +00:00
|
|
|
if i.version.linux_upstream != act_upstream:
|
2007-01-27 19:52:51 +00:00
|
|
|
break
|
|
|
|
changelog.append(i)
|
|
|
|
self.changelog = changelog
|
2007-01-27 21:20:16 +00:00
|
|
|
self.version = self.changelog[0].version
|
2007-01-27 20:56:56 +00:00
|
|
|
if self.version.linux_modifier is not None:
|
2006-08-29 09:53:31 +00:00
|
|
|
self.abiname = ''
|
2006-04-14 16:17:39 +00:00
|
|
|
else:
|
2006-08-29 09:53:31 +00:00
|
|
|
self.abiname = '-%s' % self.config['abi',]['abiname']
|
|
|
|
self.vars = self.process_version_linux(self.version, self.abiname)
|
2006-04-14 16:07:56 +00:00
|
|
|
|
2006-04-16 23:53:58 +00:00
|
|
|
def process_real_image(self, in_entry, relations, config, vars):
|
2006-01-04 19:33:32 +00:00
|
|
|
entry = self.process_package(in_entry, vars)
|
|
|
|
for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
|
2007-06-17 10:51:18 +00:00
|
|
|
value = entry.get(field, PackageRelation())
|
2006-01-04 19:33:32 +00:00
|
|
|
t = vars.get(field.lower(), [])
|
|
|
|
value.extend(t)
|
2006-04-16 23:53:58 +00:00
|
|
|
t = relations.get(field.lower(), [])
|
|
|
|
value.extend(t)
|
2006-08-29 09:53:31 +00:00
|
|
|
if value:
|
|
|
|
entry[field] = value
|
2006-01-04 19:33:32 +00:00
|
|
|
return entry
|
|
|
|
|
|
|
|
def process_real_tree(self, in_entry, vars):
|
|
|
|
entry = self.process_package(in_entry, vars)
|
2007-01-27 21:20:16 +00:00
|
|
|
versions = [i.version for i in self.changelog[::-1]]
|
2006-01-04 19:33:32 +00:00
|
|
|
for i in (('Depends', 'Provides')):
|
2007-06-17 10:51:18 +00:00
|
|
|
value = PackageRelation()
|
2006-01-06 22:32:16 +00:00
|
|
|
value.extend(entry.get(i, []))
|
2006-01-04 19:33:32 +00:00
|
|
|
if i == 'Depends':
|
2007-01-27 21:20:16 +00:00
|
|
|
value.append("linux-patch-debian-%(linux_version)s (= %(complete)s)" % self.changelog[0].version.__dict__)
|
2007-01-27 20:56:56 +00:00
|
|
|
value.append(' | '.join(["linux-source-%(linux_version)s (= %(complete)s)" % v.__dict__ for v in versions]))
|
2006-01-04 19:33:32 +00:00
|
|
|
elif i == 'Provides':
|
2007-01-27 20:56:56 +00:00
|
|
|
value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in versions])
|
2006-01-06 22:32:16 +00:00
|
|
|
entry[i] = value
|
2006-01-04 19:33:32 +00:00
|
|
|
return entry
|
* Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
debian/arch/$arch/$subarch/defines and
debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.
r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
- Use new gencontrol.
- Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.
r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.
r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/i386/defines.686,
debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
Remove
r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines,
debian/arch/sparc/defines: Update.
r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
Update.
r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp,
debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
Delete.
r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
Delete.
r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.
r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.
svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00
|
|
|
|
* Add more strict dependency between the headers packages.
* Use own config to define arches, subarches and flavours.
* Aggregate ATM options.
* Add kernel config for s390 tape image.
* Fix subarch setting for sparc.
r3970: waldi | 2005-08-18 17:58:13 +0000
debian/templates/control.headers.in: Add more strict dependency.
r3971: waldi | 2005-08-18 18:02:08 +0000
Use own config to define arches, subarches and flavours.
* debian/arch/defines: Include architecture definitions.
* debian/arch/alpha/defines, debian/arch/amd64/defines, debian/arch/arm/defines,
debian/arch/hppa/defines, debian/arch/i386/defines, debian/arch/ia64/defines,
debian/arch/m68k/defines, debian/arch/powerpc/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Include flavour definitions.
* debian/bin/gencontrol.py
- Read all configs at once.
- Use config definitions for arch, subarch and flavour detection.
r3972: waldi | 2005-08-18 18:50:08 +0000
debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/config,
debian/arch/i386/config, debian/arch/powerpc/config: Aggregate ATM options.
r3973: waldi | 2005-08-18 18:52:30 +0000
Add kernel config for s390 tape image.
* debian/arch/s390/config: Remove IPL options.
* debian/arch/s390/config.s390 debian/arch/s390/config.s390x: Add IPL options.
* debian/arch/s390/config.s390-tape: Add.
r3974: waldi | 2005-08-18 18:55:49 +0000
debian/bin/gencontrol.py: Don't output not available arches.
r3975: waldi | 2005-08-18 18:57:32 +0000
debian/arch/sparc/defines: Set kpkg-subarch to sparc64.
r3976: waldi | 2005-08-18 19:06:23 +0000
* debian/arch/powerpc/Makefile.inc, debian/arch/sparc/Makefile.inc: Remove old subarch settings.
* debian/bin/gencontrol.py: Support per subarch kpkg-subarch.
* debian/rules.real: Use subarch for header builds.
svn path=/trunk/kernel/source/linux-2.6/; revision=3981
2005-08-19 10:31:32 +00:00
|
|
|
if __name__ == '__main__':
|
2007-06-17 10:34:22 +00:00
|
|
|
Gencontrol()()
|