Re: Solving the linux-2.6 firmware issue
* Andreas Barth (aba@not.so.argh.org) [070114 00:37]:
> -Depends: linux-patch-debian-2.6.18 (= 2.6.18-8), linux-source-2.6.18 (= 2.6.18-1) | linux-source-2.6.18 (= 2.6.18-2) | linux-source-2.6.18 (= 2.6.18-3) | linux-source-2.6.18 (= 2.6.18-4) | linux-source-2.6.18 (= 2.6.18-5) | linux-source-2.6.18 (= 2.6.18-6) | linux-source-2.6.18 (= 2.6.18-7) | linux-source-2.6.18 (= 2.6.18-8)
> +Depends: linux-patch-debian-2.6.18 (= 2.6.18-9), linux-source-2.6.18 (= 2.6.18-1) | linux-source-2.6.18 (= 2.6.18-2) | linux-source-2.6.18 (= 2.6.18-3) | linux-source-2.6.18 (= 2.6.18-4) | linux-source-2.6.18 (= 2.6.18-5) | linux-source-2.6.18 (= 2.6.18-6) | linux-source-2.6.18 (= 2.6.18-7) | linux-source-2.6.18 (= 2.6.18-8) | linux-source-2.6.18 (= 2.6.18-9)
This dependency-line was broken, so I fixed the patch. The
template-change is as before.
Cheers,
Andi
--
http://home.arcor.de/andreas-barth/
diff -ur ../linux-2.6-2.6.18/debian/bin/gencontrol.py debian/bin/gencontrol.py
--- ../linux-2.6-2.6.18/debian/bin/gencontrol.py 2007-01-13 23:29:32.000000000 +0000
+++ debian/bin/gencontrol.py 2007-01-14 12:50:23.000000000 +0000
@@ -228,6 +228,12 @@
def process_changelog(self):
self.version = self.changelog[0]['Version']
+ if self.version['upstream'] == '2.6.18-dfsg':
+ self.version['upstream'] = '2.6.18'
+ self.version['linux']['upstream'] = '2.6.18'
+ self.version['linux']['source_upstream'] = '2.6.18'
+ self.version['linux']['modifier'] = None
+ self.version['linux']['source'] = self.version['upstream']+'-'+self.version['debian']
if self.version['linux']['modifier'] is not None:
self.abiname = ''
else:
@@ -251,17 +257,20 @@
entry = self.process_package(in_entry, vars)
tmp = self.changelog[0]['Version']['linux']['upstream']
versions = []
for i in self.changelog:
if i['Version']['linux']['upstream'] != tmp:
break
versions.insert(0, i['Version']['linux'])
+ versionsextra = [{u'major': '2.6', u'parent': None, u'source': '2.6.18-1', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '1'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-2', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '2'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-3', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '3'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-4', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '4'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-5', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '5'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-6', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '6'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-7', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '7'}, {u'major': '2.6', u'parent': None, u'source': '2.6.18-8', u'version': '2.6.18', 'source_upstream': '2.6.18', u'upstream': '2.6.18', u'modifier': None, u'debian': '8'}]
for i in (('Depends', 'Provides')):
value = package_relation_list()
value.extend(entry.get(i, []))
if i == 'Depends':
value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version']['linux'])
- value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % v for v in versions]))
+ value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % v for v in versionsextra]))
+ value.append(' | '.join(["linux-source-%(version)s (= %(upstream)s-dfsg-%(debian)s)" % v for v in versions]))
elif i == 'Provides':
+ value.extend(["linux-tree-%s" % v['source'].replace('~', '-') for v in versionsextra])
value.extend(["linux-tree-%s" % v['source'].replace('~', '-') for v in versions])
entry[i] = value
return entry
diff -ur ../linux-2.6-2.6.18/debian/control debian/control
--- ../linux-2.6-2.6.18/debian/control 2007-01-13 23:29:33.000000000 +0000
+++ debian/control 2007-01-14 12:50:26.000000000 +0000
@@ -68,15 +68,15 @@
This package includes the patches used to produce the prepackaged
linux-source-2.6.18 package, as well as architecture-specific patches.
Note that these patches do NOT apply against a pristine Linux 2.6.18
- kernel but only against the kernel tarball linux-2.6_2.6.18.orig.tar.gz
- from the Debian archive.
+ kernel but only against the kernel tarball
+ linux-2.6_2.6.18-dfsg.orig.tar.gz from the Debian archive.
Package: linux-tree-2.6.18
Architecture: all
Section: devel
Priority: optional
-Provides: linux-tree-2.6.18-1, linux-tree-2.6.18-2, linux-tree-2.6.18-3, linux-tree-2.6.18-4, linux-tree-2.6.18-5, linux-tree-2.6.18-6, linux-tree-2.6.18-7, linux-tree-2.6.18-8
-Depends: linux-patch-debian-2.6.18 (= 2.6.18-8), linux-source-2.6.18 (= 2.6.18-1) | linux-source-2.6.18 (= 2.6.18-2) | linux-source-2.6.18 (= 2.6.18-3) | linux-source-2.6.18 (= 2.6.18-4) | linux-source-2.6.18 (= 2.6.18-5) | linux-source-2.6.18 (= 2.6.18-6) | linux-source-2.6.18 (= 2.6.18-7) | linux-source-2.6.18 (= 2.6.18-8)
+Provides: linux-tree-2.6.18-1, linux-tree-2.6.18-2, linux-tree-2.6.18-3, linux-tree-2.6.18-4, linux-tree-2.6.18-5, linux-tree-2.6.18-6, linux-tree-2.6.18-7, linux-tree-2.6.18-8, linux-tree-2.6.18-9
+Depends: linux-patch-debian-2.6.18 (= 2.6.18-9), linux-source-2.6.18 (= 2.6.18-1) | linux-source-2.6.18 (= 2.6.18-2) | linux-source-2.6.18 (= 2.6.18-3) | linux-source-2.6.18 (= 2.6.18-4) | linux-source-2.6.18 (= 2.6.18-5) | linux-source-2.6.18 (= 2.6.18-6) | linux-source-2.6.18 (= 2.6.18-7) | linux-source-2.6.18 (= 2.6.18-8), linux-source-2.6.18 (= 2.6.18-dfsg-9)
Description: Linux kernel source tree for building Debian kernel images
This meta package is used as a build dependency of Debian linux-image
packages to prevent a version discrepancy between the linux-image and
Reply to: