* debian/bin/gencontrol.py: Call main setup method from super class.
* debian/lib/python/debian_linux/gencontrol.py: Move makeflags setup to setup method. svn path=/dists/trunk/linux-2.6/; revision=6877
This commit is contained in:
parent
b8922d8493
commit
669ed91c2c
|
@ -11,6 +11,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
||||||
self.process_changelog()
|
self.process_changelog()
|
||||||
|
|
||||||
def do_main_setup(self, vars, makeflags, extra):
|
def do_main_setup(self, vars, makeflags, extra):
|
||||||
|
super(gencontrol, self).do_main_setup(vars, makeflags, extra)
|
||||||
vars.update(self.config['image',])
|
vars.update(self.config['image',])
|
||||||
makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]])
|
makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]])
|
||||||
|
|
||||||
|
|
|
@ -38,15 +38,7 @@ class gencontrol(object):
|
||||||
vars = self.vars.copy()
|
vars = self.vars.copy()
|
||||||
vars.update(config_entry)
|
vars.update(config_entry)
|
||||||
|
|
||||||
makeflags = {
|
makeflags = {}
|
||||||
'MAJOR': self.version['major'],
|
|
||||||
'VERSION': self.version['version'],
|
|
||||||
'SOURCE_UPSTREAM': self.version['source_upstream'],
|
|
||||||
'SOURCEVERSION': self.version['source'],
|
|
||||||
'UPSTREAMVERSION': self.version['upstream'],
|
|
||||||
'ABINAME': self.abiname,
|
|
||||||
}
|
|
||||||
|
|
||||||
extra = {}
|
extra = {}
|
||||||
|
|
||||||
self.do_main_setup(vars, makeflags, extra)
|
self.do_main_setup(vars, makeflags, extra)
|
||||||
|
@ -57,7 +49,14 @@ class gencontrol(object):
|
||||||
self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
|
self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
|
||||||
|
|
||||||
def do_main_setup(self, vars, makeflags, extra):
|
def do_main_setup(self, vars, makeflags, extra):
|
||||||
pass
|
makeflags.update({
|
||||||
|
'MAJOR': self.version['major'],
|
||||||
|
'VERSION': self.version['version'],
|
||||||
|
'SOURCE_UPSTREAM': self.version['source_upstream'],
|
||||||
|
'SOURCEVERSION': self.version['source'],
|
||||||
|
'UPSTREAMVERSION': self.version['upstream'],
|
||||||
|
'ABINAME': self.abiname,
|
||||||
|
})
|
||||||
|
|
||||||
def do_main_makefile(self, makefile, makeflags, extra):
|
def do_main_makefile(self, makefile, makeflags, extra):
|
||||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||||
|
|
Loading…
Reference in New Issue