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

* debian/bin/gencontrol.py: Generate list of versions from changelog. 

* debian/lib/python/debian_linux/gencontrol.py: Read changelog.

svn path=/dists/trunk/linux-2.6/; revision=9960
This commit is contained in:
Bastian Blank 2007-12-15 23:31:06 +00:00
parent f78e4ac34d
commit 1afa7ef090
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/bin/gencontrol.py vendored
View File

@ -10,7 +10,7 @@ from debian_linux.utils import Templates
class Gencontrol(Base): class Gencontrol(Base):
def __init__(self, config_dirs = ["debian/config"], template_dirs = ["debian/templates"]): def __init__(self, config_dirs = ["debian/config"], template_dirs = ["debian/templates"]):
super(Gencontrol, self).__init__(ConfigCoreHierarchy(config_dirs), Templates(template_dirs)) super(Gencontrol, self).__init__(ConfigCoreHierarchy(config_dirs), Templates(template_dirs), VersionLinux)
self.process_changelog() self.process_changelog()
self.config_dirs = config_dirs self.config_dirs = config_dirs
@ -243,7 +243,7 @@ class Gencontrol(Base):
vars = { vars = {
'home': '/usr/src/kernel-patches/all/%s/debian' % self.version.linux_upstream, 'home': '/usr/src/kernel-patches/all/%s/debian' % self.version.linux_upstream,
'revisions': ' '.join([i.version.debian for i in self.changelog[::-1]]), 'revisions': ' '.join([i.debian for i in self.versions[::-1]]),
'source': "%(linux_upstream)s-%(debian)s" % self.version.__dict__, 'source': "%(linux_upstream)s-%(debian)s" % self.version.__dict__,
'upstream': self.version.linux_upstream, 'upstream': self.version.linux_upstream,
} }
@ -255,14 +255,13 @@ class Gencontrol(Base):
file('debian/bin/patch.unpatch', 'w').write(unpatch) file('debian/bin/patch.unpatch', 'w').write(unpatch)
def process_changelog(self): def process_changelog(self):
in_changelog = Changelog(version = VersionLinux) act_upstream = self.changelog[0].version.linux_upstream
act_upstream = in_changelog[0].version.linux_upstream versions = []
changelog = [] for i in self.changelog:
for i in in_changelog:
if i.version.linux_upstream != act_upstream: if i.version.linux_upstream != act_upstream:
break break
changelog.append(i) versions.append(i.version)
self.changelog = changelog self.versions = versions
self.version = self.changelog[0].version self.version = self.changelog[0].version
if self.version.linux_modifier is not None: if self.version.linux_modifier is not None:
self.abiname = '' self.abiname = ''
@ -285,16 +284,15 @@ class Gencontrol(Base):
def process_real_tree(self, in_entry, vars): def process_real_tree(self, in_entry, vars):
entry = self.process_package(in_entry, vars) entry = self.process_package(in_entry, vars)
versions = [i.version for i in self.changelog[::-1]]
for i in (('Depends', 'Provides')): for i in (('Depends', 'Provides')):
value = PackageRelation() value = PackageRelation()
value.extend(entry.get(i, [])) value.extend(entry.get(i, []))
if i == 'Depends': if i == 'Depends':
v = self.changelog[0].version v = self.changelog[0].version
value.append("linux-patch-debian-%s (= %s)" % (v.linux_version, v.complete)) value.append("linux-patch-debian-%s (= %s)" % (v.linux_version, v.complete))
value.append(' | '.join(["linux-source-%s (= %s)" % (v.linux_version, v.complete) for v in versions])) value.append(' | '.join(["linux-source-%s (= %s)" % (v.linux_version, v.complete) for v in self.versions]))
elif i == 'Provides': elif i == 'Provides':
value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in versions]) value.extend(["linux-tree-%s" % v.complete.replace('~', '-') for v in self.versions])
entry[i] = value entry[i] = value
return entry return entry

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

@ -69,8 +69,9 @@ class MakeFlags(dict):
class Gencontrol(object): class Gencontrol(object):
makefile_targets = ('binary-arch', 'build', 'setup', 'source') makefile_targets = ('binary-arch', 'build', 'setup', 'source')
def __init__(self, config, templates): def __init__(self, config, templates, version = Version):
self.config, self.templates = config, templates self.config, self.templates = config, templates
self.changelog = Changelog(version = version)
def __call__(self): def __call__(self):
packages = PackagesList() packages = PackagesList()