debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
debian/modules/gencontrol.py: Provide extra arg to each recursing method. svn path=/dists/trunk/linux-2.6/; revision=6876
This commit is contained in:
Bastian Blank
parent
ebc6106981
commit
b8922d8493
|
|
@ -10,11 +10,11 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
self.changelog = read_changelog()
|
||||
self.process_changelog()
|
||||
|
||||
def do_main_setup(self, vars, makeflags):
|
||||
def do_main_setup(self, vars, makeflags, extra):
|
||||
vars.update(self.config['image',])
|
||||
makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]])
|
||||
|
||||
def do_main_packages(self, packages):
|
||||
def do_main_packages(self, packages, extra):
|
||||
vars = self.vars
|
||||
|
||||
main = self.templates["control.main"]
|
||||
|
|
@ -25,7 +25,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
|
||||
packages.extend(self.process_packages(self.templates["control.support"], vars))
|
||||
|
||||
def do_arch_setup(self, vars, makeflags, arch):
|
||||
def do_arch_setup(self, vars, makeflags, arch, extra):
|
||||
vars.update(self.config.get(('image', arch), {}))
|
||||
|
||||
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
||||
|
|
@ -54,7 +54,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
makefile.append(("setup-%s-real:" % arch))
|
||||
makefile.append(("source-%s-real:" % arch, cmds_source))
|
||||
|
||||
def do_subarch_setup(self, vars, makeflags, arch, subarch):
|
||||
def do_subarch_setup(self, vars, makeflags, arch, subarch, extra):
|
||||
vars.update(self.config.get(('image', arch, subarch), {}))
|
||||
vars['localversion_headers'] = vars['localversion']
|
||||
for i in (
|
||||
|
|
@ -87,7 +87,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
makefile.append(("setup-%s-%s-real:" % (arch, subarch)))
|
||||
makefile.append(("source-%s-%s-real:" % (arch, subarch), cmds_source))
|
||||
|
||||
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour):
|
||||
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
|
||||
vars.update(self.config.get(('image', arch, subarch, flavour), {}))
|
||||
for i in (
|
||||
('compiler', 'COMPILER'),
|
||||
|
|
|
|||
|
|
@ -47,17 +47,19 @@ class gencontrol(object):
|
|||
'ABINAME': self.abiname,
|
||||
}
|
||||
|
||||
self.do_main_setup(vars, makeflags)
|
||||
self.do_main_packages(packages)
|
||||
self.do_main_makefile(makefile, makeflags)
|
||||
extra = {}
|
||||
|
||||
self.do_main_setup(vars, makeflags, extra)
|
||||
self.do_main_packages(packages, extra)
|
||||
self.do_main_makefile(makefile, makeflags, extra)
|
||||
|
||||
for arch in iter(self.config['base',]['arches']):
|
||||
self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy())
|
||||
self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
|
||||
|
||||
def do_main_setup(self, vars, makeflags):
|
||||
def do_main_setup(self, vars, makeflags, extra):
|
||||
pass
|
||||
|
||||
def do_main_makefile(self, makefile, makeflags):
|
||||
def do_main_makefile(self, makefile, makeflags, extra):
|
||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||
|
||||
cmds_binary_indep = []
|
||||
|
|
@ -93,7 +95,7 @@ class gencontrol(object):
|
|||
makefile.append("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch))
|
||||
makefile.append(("binary-arch-%s-extra:" % arch, cmds))
|
||||
|
||||
def do_arch(self, packages, makefile, arch, vars, makeflags):
|
||||
def do_arch(self, packages, makefile, arch, vars, makeflags, extra):
|
||||
config_entry = self.config['base', arch]
|
||||
vars.update(config_entry)
|
||||
vars['arch'] = arch
|
||||
|
|
@ -103,13 +105,12 @@ class gencontrol(object):
|
|||
makefile.append(("%s-%s:" % (i, arch), ["@echo Architecture %s is not available!" % arch, "@exit 1"]))
|
||||
return
|
||||
|
||||
extra = {}
|
||||
makeflags['ARCH'] = arch
|
||||
|
||||
vars['localversion'] = ''
|
||||
|
||||
self.do_arch_setup(vars, makeflags, arch)
|
||||
self.do_arch_makefile(makefile, arch, makeflags)
|
||||
self.do_arch_setup(vars, makeflags, arch, extra)
|
||||
self.do_arch_makefile(makefile, arch, makeflags, extra)
|
||||
self.do_arch_packages(packages, makefile, arch, vars, makeflags, extra)
|
||||
|
||||
for subarch in config_entry['subarches']:
|
||||
|
|
@ -117,10 +118,10 @@ class gencontrol(object):
|
|||
|
||||
self.do_arch_packages_post(packages, makefile, arch, vars, makeflags, extra)
|
||||
|
||||
def do_arch_setup(self, vars, makeflags, arch):
|
||||
def do_arch_setup(self, vars, makeflags, arch, extra):
|
||||
pass
|
||||
|
||||
def do_arch_makefile(self, makefile, arch, makeflags):
|
||||
def do_arch_makefile(self, makefile, arch, makeflags, extra):
|
||||
for i in self.makefile_targets:
|
||||
makefile.append("%s:: %s-%s" % (i, i, arch))
|
||||
makefile.append("%s-%s:: %s-%s-real" % (i, arch, i, arch))
|
||||
|
|
@ -140,17 +141,17 @@ class gencontrol(object):
|
|||
if subarch != 'none':
|
||||
vars['localversion'] += '-' + subarch
|
||||
|
||||
self.do_subarch_setup(vars, makeflags, arch, subarch)
|
||||
self.do_subarch_makefile(makefile, arch, subarch, makeflags)
|
||||
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)
|
||||
|
||||
for flavour in config_entry['flavours']:
|
||||
self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), extra)
|
||||
|
||||
def do_subarch_setup(self, vars, makeflags, arch, subarch):
|
||||
def do_subarch_setup(self, vars, makeflags, arch, subarch, extra):
|
||||
pass
|
||||
|
||||
def do_subarch_makefile(self, makefile, arch, subarch, makeflags):
|
||||
def do_subarch_makefile(self, makefile, arch, subarch, 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))
|
||||
|
|
@ -172,11 +173,11 @@ class gencontrol(object):
|
|||
makeflags['FLAVOUR'] = flavour
|
||||
vars['localversion'] += '-' + flavour
|
||||
|
||||
self.do_flavour_setup(vars, makeflags, arch, subarch, flavour)
|
||||
self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)
|
||||
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)
|
||||
|
||||
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour):
|
||||
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
|
||||
for i in (
|
||||
('compiler', 'COMPILER'),
|
||||
('kernel-arch', 'KERNEL_ARCH'),
|
||||
|
|
@ -185,7 +186,7 @@ class gencontrol(object):
|
|||
if vars.has_key(i[0]):
|
||||
makeflags[i[1]] = vars[i[0]]
|
||||
|
||||
def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags):
|
||||
def do_flavour_makefile(self, makefile, arch, subarch, 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))
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
super(gencontrol, self).__init__(config)
|
||||
self.process_config_version(config_parser({}, [sys.path[0] + "/../version"]))
|
||||
|
||||
def do_main_packages(self, packages):
|
||||
def do_main_packages(self, packages, extra):
|
||||
vars = self.vars
|
||||
|
||||
main = self.templates["control.main"]
|
||||
|
|
|
|||
Loading…
Reference in New Issue