[kernel] r7340 - in dists/trunk/firmware-nonfree/debian: . bin

[Bastian Blank]

Author: waldi
Date: Tue Sep  5 15:18:47 2006
New Revision: 7340

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/rules

Log:
debian/bin/gencontrol.py, debian/rules: Add linux-support build dependency.


Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	(original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Tue Sep  5 15:18:47 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.4
 import sys
-sys.path.append(sys.argv[1]+ "/lib/python")
+sys.path.append(sys.argv[2]+ "/lib/python")
 import debian_linux.config
 from debian_linux.debian import *
 from debian_linux.utils import *
@@ -14,9 +14,10 @@
             self[package['Package']] = package
 
 class gencontrol(object):
-    def __init__(self):
+    def __init__(self, kernelversion):
         self.config = config_reader()
         self.templates = templates()
+        self.kernelversion = kernelversion
 
     def __call__(self):
         packages = packages_list()
@@ -41,6 +42,8 @@
         for i in ('build', 'binary-arch', 'setup', 'source'):
             makefile.append(("%s-%%:" % i, ["@true"]))
 
+        packages['source']['Build-Depends'].append('linux-support-%s' % self.kernelversion)
+
         for package in iter(self.config['base',]['packages']):
             self.do_package(packages, makefile, package, vars.copy(), makeflags.copy())
 
@@ -203,4 +206,4 @@
             self[tuple(real)] = s
 
 if __name__ == '__main__':
-    gencontrol()()
+    gencontrol(sys.argv[1])()

Modified: dists/trunk/firmware-nonfree/debian/rules
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules	(original)
+++ dists/trunk/firmware-nonfree/debian/rules	Tue Sep  5 15:18:47 2006
@@ -4,7 +4,7 @@
 include debian/rules.defs
 include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
 
-GENCONTROL = debian/bin/gencontrol.py /usr/src/linux-support-$(KERNELVERSION)
+GENCONTROL = debian/bin/gencontrol.py $(KERNELVERSION)
 
 maintainerclean:
 	-rm debian/control debian/control.md5sum debian/rules.gen