[kernel] r4807 - in people/waldi/linux-2.6/debian: bin
lib/python/debian_linux
Bastian Blank
waldi at costa.debian.org
Sun Nov 13 16:07:31 UTC 2005
Author: waldi
Date: Sun Nov 13 16:07:26 2005
New Revision: 4807
Modified:
people/waldi/linux-2.6/debian/bin/gencontrol.py
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py: Update.
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 Sun Nov 13 16:07:26 2005
@@ -10,7 +10,7 @@
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
- def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags):
+ 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)
@@ -44,7 +44,7 @@
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
- def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
+ def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
image = self.templates["control.image"]
headers = self.templates["control.headers"]
image_latest = self.templates["control.image.latest"]
@@ -66,7 +66,7 @@
package['Architecture'] = (' ', [arch])
packages.append(package)
- package_headers_arch_depends.append(packages_own[1]['Package'])
+ extra['headers_arch_depends'].append(packages_own[1]['Package'])
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
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 Sun Nov 13 16:07:26 2005
@@ -100,9 +100,28 @@
makefile.append(("%s-%s:" % (i, arch), ["@echo Architecture %s is not available!" % arch, "@exit 1"]))
return
+ extra = {}
+ makeflags['ARCH'] = arch
+ self.do_arch_makeflags(makeflags, arch)
+ self.do_arch_makefile(makefile, arch, makeflags)
+ self.do_arch_packages(packages, makefile, arch, vars, makeflags, extra)
+
+ for subarch in config_entry['subarches']:
+ self.do_subarch(packages, makefile, arch, subarch, vars.copy(), makeflags.copy(), extra)
+
+ self.do_arch_packages_post(packages, makefile, arch, vars, makeflags, extra)
+
+ def do_arch_makeflags(self, makeflags, arch):
+ pass
+
+ def do_arch_makefile(self, makefile, arch, makeflags):
+ for i in (('binary-arch', 'build', 'setup',)):
+ makefile.append("%s-%s:: %s-%s-real" % (i, arch, i, arch))
+
+ def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
headers_arch = self.templates["control.headers.arch"]
package_headers_arch = self.process_package(headers_arch[0], vars)
- package_headers_arch_depends = []
+ extra['headers_arch_depends'] = []
name = package_headers_arch['Package']
if packages.has_key(name):
@@ -112,26 +131,23 @@
package_headers_arch['Architecture'] = (' ', [arch])
packages.append(package_headers_arch)
- for i in (('binary-arch', 'setup',)):
- makefile.append("%s-%s:: %s-%s-real" % (i, arch, i, arch))
-
- makeflags['ARCH'] = arch
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_setup = []
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % makeflags_string,))
makefile.append(("setup-%s-real:" % arch, cmds_setup))
- for subarch in config_entry['subarches']:
- self.do_subarch(packages, makefile, arch, subarch, vars.copy(), makeflags.copy(), package_headers_arch_depends)
+ def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
+ config_entry = self.config[arch,]
+ 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(package_headers_arch_depends), makeflags_string),))
+ 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))
- def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, package_headers_arch_depends):
+ def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
if subarch == 'none':
vars['subarch'] = ''
else:
@@ -142,10 +158,10 @@
makeflags['SUBARCH'] = subarch
self.do_subarch_makeflags(makeflags, arch, subarch)
self.do_subarch_makefile(makefile, arch, subarch, makeflags)
- self.do_subarch_packages(packages, makefile, arch, subarch, vars, makeflags)
+ self.do_subarch_packages(packages, makefile, arch, subarch, vars, makeflags, extra)
for flavour in config_entry['flavours']:
- self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), package_headers_arch_depends)
+ self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), extra)
def do_subarch_makeflags(self, makeflags, arch, subarch):
pass
@@ -157,10 +173,10 @@
for i in ('binary-arch', 'build', 'setup'):
makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch))
- def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags):
+ def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
pass
- def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
+ def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
config_entry = self.config[arch, subarch, flavour]
vars.update(config_entry)
@@ -173,7 +189,7 @@
makeflags['FLAVOUR'] = flavour
self.do_flavour_makeflags(makeflags, arch, subarch, flavour)
self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)
- self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends)
+ self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
pass
@@ -183,7 +199,7 @@
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))
- def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
+ def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
pass
def process_changelog(self, in_vars):
More information about the Kernel-svn-changes
mailing list