[kernel] r18679 - in dists/trunk/firmware-free/debian: . bin

[Ben Hutchings]

Author: benh
Date: Sat Feb 11 18:17:31 2012
New Revision: 18679

Log:
Remove build-dependency on linux-support

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

Modified: dists/trunk/firmware-free/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-free/debian/bin/gencontrol.py	Sat Feb 11 18:01:57 2012	(r18678)
+++ dists/trunk/firmware-free/debian/bin/gencontrol.py	Sat Feb 11 18:17:31 2012	(r18679)
@@ -2,7 +2,7 @@
 
 import os, re, sys
 
-sys.path.append(sys.argv[2] + "/lib/python")
+sys.path.append(sys.argv[1] + "/lib/python")
 
 from debian_linux.config import ConfigParser, SchemaItemList
 from debian_linux.debian import Package, PackageRelation
@@ -134,10 +134,9 @@
 
 
 class GenControl(debian_linux.gencontrol.Gencontrol):
-    def __init__(self, kernelversion):
+    def __init__(self):
         self.config = Config()
         self.templates = Templates()
-        self.kernelversion = kernelversion
 
     def __call__(self):
         packages = PackagesList()
@@ -151,7 +150,6 @@
     def do_source(self, packages):
         source = self.templates["control.source"]
         packages['source'] = self.process_package(source[0], ())
-        packages['source']['Build-Depends'].append('linux-support-%s' % self.kernelversion)
 
     def do_main(self, packages, makefile):
         config_entry = self.config['base',]
@@ -336,4 +334,4 @@
             self[real] = s
 
 if __name__ == '__main__':
-    GenControl(sys.argv[1])()
+    GenControl()()

Modified: dists/trunk/firmware-free/debian/changelog
==============================================================================
--- dists/trunk/firmware-free/debian/changelog	Sat Feb 11 18:01:57 2012	(r18678)
+++ dists/trunk/firmware-free/debian/changelog	Sat Feb 11 18:17:31 2012	(r18679)
@@ -1,6 +1,8 @@
 firmware-free (3.1) UNRELEASED; urgency=low
 
   * Update to linux-support 3.1.0-1
+    - Remove build-dependency, as this is only used when preparing the
+      source package
   * Add isci parameter blob
   * Add makefiles and scripts for av7110, dsp56k and keyspan_pda firmware
 

Modified: dists/trunk/firmware-free/debian/rules
==============================================================================
--- dists/trunk/firmware-free/debian/rules	Sat Feb 11 18:01:57 2012	(r18678)
+++ dists/trunk/firmware-free/debian/rules	Sat Feb 11 18:17:31 2012	(r18679)
@@ -37,7 +37,7 @@
 endif
 
 debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
-	$(GENCONTROL) $(KERNELVERSION) /usr/src/linux-support-$(KERNELVERSION)
+	$(GENCONTROL) /usr/src/linux-support-$(KERNELVERSION)
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure