debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/bin/gencontrol.py: Cleanup. 

* debian/lib/python/debian_linux/gencontrol.py
  - Provide all informations for main type functions.
  - Remove some "vars" updates.

svn path=/dists/trunk/linux-2.6/; revision=11352
This commit is contained in:
Bastian Blank 2008-05-11 18:17:54 +00:00
parent c9dff4f35c
commit 72d6fe9b3c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/bin/gencontrol.py vendored
View File

@ -16,7 +16,6 @@ class Gencontrol(Base):
def do_main_setup(self, vars, makeflags, extra):
super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
vars.update(self.config['image',])
makeflags.update({
'MAJOR': self.version.linux_major,
'VERSION': self.version.linux_version,
@ -25,7 +24,7 @@ class Gencontrol(Base):
'SOURCEVERSION': self.version.complete,
})
def do_main_packages(self, packages, extra):
def do_main_packages(self, packages, vars, makeflags, extra):
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))

14
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -95,17 +95,14 @@ class Gencontrol(object):
def do_main(self, packages, makefile):
config_entry = self.config['base',]
vars = self.vars.copy()
vars.update(config_entry)
makeflags = 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(), extra)
self.do_main_packages(packages, vars, makeflags, extra)
self.do_main_recurse(packages, makefile, vars, makeflags, extra)
def do_main_setup(self, vars, makeflags, extra):
pass
@ -113,9 +110,13 @@ class Gencontrol(object):
def do_main_makefile(self, makefile, makeflags, extra):
makefile.add('binary-indep', cmds = ["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
def do_main_packages(self, packages, extra):
def do_main_packages(self, packages, vars, makeflags, extra):
pass
def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
for arch in iter(self.config['base',]['arches']):
self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
def do_extra(self, packages, makefile):
templates_extra = self.templates.get("control.extra", None)
if templates_extra is None:
@ -143,7 +144,6 @@ class Gencontrol(object):
def do_arch(self, packages, makefile, arch, vars, makeflags, extra):
config_base = self.config['base', arch]
vars.update(config_base)
vars['arch'] = arch
makeflags['ARCH'] = arch