[kernel] r9206 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Fri Jul 27 15:31:44 UTC 2007
Author: waldi
Date: Fri Jul 27 15:31:44 2007
New Revision: 9206
Log:
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py:
Use featureset instead of subarch.
* debian/lib/python/debian_linux/config.py: Set featuresets if necessary.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
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 (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Fri Jul 27 15:31:44 2007
@@ -49,8 +49,8 @@
makefile.append(("setup-%s-real:" % arch))
makefile.append(("source-%s-real:" % arch, cmds_source))
- def do_subarch_setup(self, vars, makeflags, arch, subarch, extra):
- vars.update(self.config.get(('image', arch, subarch), {}))
+ def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
+ vars.update(self.config.get(('image', arch, featureset), {}))
vars['localversion_headers'] = vars['localversion']
for i in (
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
@@ -59,9 +59,9 @@
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
- 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)
+ def do_featureset_packages(self, packages, makefile, arch, featureset, vars, makeflags, extra):
+ headers_featureset = self.templates["control.headers.subarch"]
+ package_headers = self.process_package(headers_featureset[0], vars)
name = package_headers['Package']
if packages.has_key(name):
@@ -75,13 +75,13 @@
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags,))
cmds_source = []
cmds_source.append(("$(MAKE) -f debian/rules.real source-subarch %s" % makeflags,))
- makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
- makefile.append("build-%s-%s-real:" % (arch, subarch))
- makefile.append(("setup-%s-%s-real:" % (arch, subarch)))
- makefile.append(("source-%s-%s-real:" % (arch, subarch), cmds_source))
+ makefile.append(("binary-arch-%s-%s-real:" % (arch, featureset), cmds_binary_arch))
+ makefile.append("build-%s-%s-real:" % (arch, featureset))
+ makefile.append(("setup-%s-%s-real:" % (arch, featureset)))
+ makefile.append(("source-%s-%s-real:" % (arch, featureset), cmds_source))
- def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
- vars.update(self.config.get(('image', arch, subarch, flavour), {}))
+ def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
+ vars.update(self.config.get(('image', arch, featureset, flavour), {}))
for i in (
('cflags', 'CFLAGS'),
('compiler', 'COMPILER'),
@@ -98,11 +98,11 @@
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
- def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
+ def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
headers = self.templates["control.headers"]
- config_entry_base = self.config.merge('base', arch, subarch, flavour)
- config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
+ config_entry_base = self.config.merge('base', arch, featureset, flavour)
+ config_entry_relations = self.config.merge('relations', arch, featureset, flavour)
compiler = config_entry_base.get('compiler', 'gcc')
relations_compiler = PackageRelation(config_entry_relations[compiler])
@@ -118,7 +118,7 @@
}
if vars.get('initramfs', True):
generators = vars['initramfs-generators']
- config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, subarch, flavour)
+ config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, featureset, flavour)
commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
makeflags['INITRD_CMD'] = ' '.join(commands)
l_depends = PackageRelationGroup()
@@ -140,7 +140,7 @@
elif vars['type'] == 'plain-xen':
image = self.templates["control.image.type-modulesextra"]
build_modules = True
- config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
+ config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
p = self.process_packages(self.templates['control.xen-linux-system'], vars)
l = package_relation_group()
for version in config_entry_xen['versions']:
@@ -192,11 +192,11 @@
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))
+ if featureset == 'none':
+ kconfig.extend(get_config(["%s/config.%s" % (arch, flavour)], arch, featureset, 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))
+ kconfig.extend(get_config(["%s/%s/config" % (arch, featureset)], arch, featureset))
+ kconfig.extend(get_config(["%s/%s/config.%s" % (arch, featureset, flavour)], arch, featureset, flavour))
makeflags['KCONFIG'] = ' '.join(kconfig)
cmds_binary_arch = []
@@ -207,10 +207,10 @@
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags,))
cmds_setup = []
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags,))
- 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))
- makefile.append(("source-%s-%s-%s-real:" % (arch, subarch, flavour)))
+ makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, featureset, flavour), cmds_binary_arch))
+ makefile.append(("build-%s-%s-%s-real:" % (arch, featureset, flavour), cmds_build))
+ makefile.append(("setup-%s-%s-%s-real:" % (arch, featureset, flavour), cmds_setup))
+ makefile.append(("source-%s-%s-%s-real:" % (arch, featureset, flavour)))
def do_extra(self, packages, makefile):
apply = self.templates['patch.apply']
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 (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Fri Jul 27 15:31:44 2007
@@ -88,7 +88,7 @@
base = self['base', arch]
# TODO
- base['subarches'] = featuresets
+ base['featuresets'] = base['subarches'] = featuresets
if flavours:
featuresets.insert(0, 'none')
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 (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Fri Jul 27 15:31:44 2007
@@ -132,40 +132,40 @@
makefile.append("%s-%s-real:" % (i, arch))
def do_arch_recurse(self, packages, makefile, arch, vars, makeflags, extra):
- for subarch in self.config['base', arch]['subarches']:
- self.do_subarch(packages, makefile, arch, subarch, vars.copy(), makeflags.copy(), extra)
+ for featureset in self.config['base', arch]['featuresets']:
+ self.do_featureset(packages, makefile, arch, featureset, vars.copy(), makeflags.copy(), extra)
- def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
- config_entry = self.config['base', arch, subarch]
+ def do_featureset(self, packages, makefile, arch, featureset, vars, makeflags, extra):
+ config_entry = self.config['base', arch, featureset]
vars.update(config_entry)
- makeflags['SUBARCH'] = subarch
- if subarch != 'none':
- vars['localversion'] += '-' + subarch
-
- self.do_subarch_setup(vars, makeflags, arch, subarch, extra)
- self.do_subarch_makefile(makefile, arch, subarch, makeflags, extra)
- self.do_subarch_packages(packages, makefile, arch, subarch, vars, makeflags, extra)
- self.do_subarch_recurse(packages, makefile, arch, subarch, vars, makeflags, extra)
+ makeflags['SUBARCH'] = featureset
+ if featureset != 'none':
+ vars['localversion'] += '-' + featureset
+
+ self.do_featureset_setup(vars, makeflags, arch, featureset, extra)
+ self.do_featureset_makefile(makefile, arch, featureset, makeflags, extra)
+ self.do_featureset_packages(packages, makefile, arch, featureset, vars, makeflags, extra)
+ self.do_featureset_recurse(packages, makefile, arch, featureset, vars, makeflags, extra)
- def do_subarch_setup(self, vars, makeflags, arch, subarch, extra):
+ def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
pass
- def do_subarch_makefile(self, makefile, arch, subarch, makeflags, extra):
+ def do_featureset_makefile(self, makefile, arch, featureset, makeflags, extra):
for i in self.makefile_targets:
- makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch))
- makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch))
+ makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch, featureset))
+ makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, featureset, i, arch, featureset))
- def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
+ def do_featureset_packages(self, packages, makefile, arch, featureset, vars, makeflags, extra):
for i in self.makefile_targets:
- makefile.append("%s-%s-%s-real:" % (i, arch, subarch))
+ makefile.append("%s-%s-%s-real:" % (i, arch, featureset))
- def do_subarch_recurse(self, packages, makefile, arch, subarch, vars, makeflags, extra):
- for flavour in self.config['base', arch, subarch]['flavours']:
- self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), extra)
+ def do_featureset_recurse(self, packages, makefile, arch, featureset, vars, makeflags, extra):
+ for flavour in self.config['base', arch, featureset]['flavours']:
+ self.do_flavour(packages, makefile, arch, featureset, flavour, vars.copy(), makeflags.copy(), extra)
- def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
- config_entry = self.config.merge('base', arch, subarch, flavour)
+ def do_flavour(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
+ config_entry = self.config.merge('base', arch, featureset, flavour)
vars.update(config_entry)
if not vars.has_key('longclass'):
@@ -174,11 +174,11 @@
makeflags['FLAVOUR'] = flavour
vars['localversion'] += '-' + flavour
- self.do_flavour_setup(vars, makeflags, arch, subarch, flavour, extra)
- self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags, extra)
- self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
+ self.do_flavour_setup(vars, makeflags, arch, featureset, flavour, extra)
+ self.do_flavour_makefile(makefile, arch, featureset, flavour, makeflags, extra)
+ self.do_flavour_packages(packages, makefile, arch, featureset, flavour, vars, makeflags, extra)
- def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
+ def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
for i in (
('kernel-arch', 'KERNEL_ARCH'),
('localversion', 'LOCALVERSION'),
@@ -186,12 +186,12 @@
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
- def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags, extra):
+ def do_flavour_makefile(self, makefile, arch, featureset, flavour, makeflags, extra):
for i in self.makefile_targets:
- makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour))
- makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour))
+ makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, featureset, i, arch, featureset, flavour))
+ makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, featureset, flavour, i, arch, featureset, flavour))
- def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
+ def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
pass
def process_relation(self, key, e, in_e, vars):
More information about the Kernel-svn-changes
mailing list