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

* debian/bin/gencontrol.py 

- Add class for makeflags.
  - Remove string generation from makeflags.
* debian/lib/python/debian_linux/gencontrol.py: 
  Remove string generation from makeflags.

svn path=/dists/sid/linux-2.6/; revision=7208
This commit is contained in:
Bastian Blank 2006-08-20 12:46:19 +00:00
parent ec7cd56ec1
commit 70d0b65abf
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/bin/gencontrol.py vendored
View File

@ -40,12 +40,10 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
package['Architecture'] = [arch]
packages.append(package)
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_arch = []
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags_string))
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags))
cmds_source = []
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags_string,))
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags,))
makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
makefile.append(("build-%s-real:" % arch))
makefile.append(("setup-%s-real:" % arch))
@ -73,12 +71,10 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
package_headers['Architecture'] = [arch]
packages.append(package_headers)
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_arch = []
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags_string,))
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_string,))
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)))
@ -155,14 +151,12 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
package['Architecture'] = [arch]
packages.append(package)
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_arch = []
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
cmds_build = []
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
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_string,))
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))

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

@ -11,6 +11,17 @@ class packages_list(sorted_dict):
for package in packages:
self[package['Package']] = package
class flags(dict):
def __repr__(self):
repr = super(flags, self).__repr__()
return "%s(%s)" % (self.__class__.__name__, repr)
def __str__(self):
return ' '.join(["%s='%s'" % i for i in self.iteritems()])
def copy(self):
return self.__class__(super(flags, self).copy())
class gencontrol(object):
makefile_targets = ('binary-arch', 'build', 'setup', 'source')
@ -38,7 +49,7 @@ class gencontrol(object):
vars = self.vars.copy()
vars.update(config_entry)
makeflags = {}
makeflags = flags()
extra = {}
self.do_main_setup(vars, makeflags, extra)
@ -57,10 +68,8 @@ class gencontrol(object):
})
def do_main_makefile(self, makefile, makeflags, extra):
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_indep = []
cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags_string,))
cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags,))
makefile.append(("binary-indep:", cmds_binary_indep))
def do_main_packages(self, packages, extra):