[Pkg-loop-aes-commits] r1477 - in /trunk/loop-aes: ./ debian/bin/gencontrol.py debian/changelog
xam at users.alioth.debian.org
xam at users.alioth.debian.org
Sat Dec 8 19:48:12 UTC 2007
Author: xam
Date: Sat Dec 8 19:48:11 2007
New Revision: 1477
URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1477
Log:
Adapt gencontrol to linux-support-2.6.23-1
Modified:
trunk/loop-aes/ (props changed)
trunk/loop-aes/debian/bin/gencontrol.py
trunk/loop-aes/debian/changelog
Propchange: trunk/loop-aes/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Dec 8 19:48:11 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes:11472
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes:11729
21abe0f1-f0ee-4de9-8a33-02d62b012b6b:/local/pkg-loop-aes/trunk/loop-aes:9932
21abe0f1-f0ee-4de9-8a33-02d62b012b6b:/local/temp:9926
53348a03-e5de-0310-b097-96e6f85ea926:/loop-aes/trunk:1255
Modified: trunk/loop-aes/debian/bin/gencontrol.py
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/bin/gencontrol.py?rev=1477&op=diff
==============================================================================
--- trunk/loop-aes/debian/bin/gencontrol.py (original)
+++ trunk/loop-aes/debian/bin/gencontrol.py Sat Dec 8 19:48:11 2007
@@ -1,34 +1,45 @@
#!/usr/bin/env python2.4
import sys
sys.path.append(sys.argv[1] + "/lib/python")
-import debian_linux.gencontrol
+from debian_linux.gencontrol import *
from debian_linux.config import *
from debian_linux.debian import *
+from debian_linux.utils import Templates
-class gencontrol(debian_linux.gencontrol.Gencontrol):
- def __init__(self, config):
- super(gencontrol, self).__init__(config)
- self.process_config_version(ConfigParser({}, [sys.argv[1] + "/version"]))
+class gencontrol(Gencontrol):
+ def __init__(self, config_dump):
+ templates = Templates(['debian/templates'])
+ config = ConfigCoreDump(fp = file(config_dump))
+ super(gencontrol, self).__init__(config, templates)
+ self.process_config_version()
+
+ def __call__(self):
+ packages = PackagesList()
+ makefile = Makefile()
+
+ self.do_source(packages)
+ self.do_main(packages, makefile)
+
+ self.write(packages, makefile)
def do_main_packages(self, packages, extra):
- vars = self.vars
-
main = self.templates["control.main"]
- packages.extend(self.process_packages(main, vars))
+ packages.extend(self.process_packages(main, self.vars))
packages['source']['Build-Depends'].extend(
['linux-support-%s%s' % (self.version.linux_upstream, self.abiname)]
)
packages['source']['Build-Depends'].extend(
- ['linux-headers-%s%s-all-%s [%s]' % (self.version.linux_upstream, self.abiname, arch, arch)
- for arch in self.config['base',]['arches']],
+ ['linux-headers-%s%s-all-%s [%s]' % (
+ self.version.linux_upstream, self.abiname, arch, arch)
+ for arch in self.config['base',]['arches']],
)
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
config_entry = self.config.merge('base', arch, subarch, flavour)
if config_entry.get('modules', True) is False:
for i in self.makefile_targets:
- makefile.append("%s-%s-%s-%s-real:" % (i, arch, subarch, flavour))
+ makefile.add("%s-%s-%s-%s-real:" % (i, arch, subarch, flavour))
return
modules = self.templates["control.modules"]
@@ -43,23 +54,22 @@
package['Architecture'] = [arch]
packages.append(package)
- makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+ 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_build = []
- cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
- cmds_setup = []
- cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
- 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))
+ cmd_binary_arch = "$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string
+ cmd_build = "$(MAKE) -f debian/rules.real build %s" % makeflags_string
+ cmd_setup = "$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string
- def process_config_version(self, config):
- entry = config['version',]
+ makefile.add("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds = [cmd_binary_arch])
+ makefile.add("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds = [cmd_build])
+ makefile.add("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds = [cmd_setup])
+
+ def process_config_version(self):
+ entry = self.config['version',]
self.version = VersionLinux(entry['source'])
self.abiname = entry['abiname']
self.vars = self.process_version_linux(self.version, self.abiname)
if __name__ == '__main__':
- gencontrol(sys.argv[1] + "/arch")()
+ gencontrol(sys.argv[1] + "/config.defines.dump")()
Modified: trunk/loop-aes/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/changelog?rev=1477&op=diff
==============================================================================
--- trunk/loop-aes/debian/changelog (original)
+++ trunk/loop-aes/debian/changelog Sat Dec 8 19:48:11 2007
@@ -1,3 +1,9 @@
+loop-aes (3.2b-2) UNRELEASED; urgency=low
+
+ * Adapt gencontrol to linux-support-2.6.23-1
+
+ -- Max Vozeler <xam at debian.org> Sat, 08 Dec 2007 19:45:43 +0100
+
loop-aes (3.2b-1) unstable; urgency=low
* New upstream release
More information about the Pkg-loop-aes-commits
mailing list