[kernel] r14209 - in dists/sid/linux-latest-2.6/debian: . bin modules templates

[Ben Hutchings]

Author: benh
Date: Sun Sep  6 18:13:53 2009
New Revision: 14209

Log:
Revert unfinished change accidentally commited in r14208

Deleted:
   dists/sid/linux-latest-2.6/debian/modules/
   dists/sid/linux-latest-2.6/debian/templates/control.support.all.in
Modified:
   dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
   dists/sid/linux-latest-2.6/debian/changelog
   dists/sid/linux-latest-2.6/debian/rules
   dists/sid/linux-latest-2.6/debian/rules.defs
   dists/sid/linux-latest-2.6/debian/rules.real

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Sun Sep  6 18:08:50 2009	(r14208)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Sun Sep  6 18:13:53 2009	(r14209)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import os, sys
+import sys
 sys.path.append(sys.argv[1] + "/lib/python")
 
 from debian_linux.config import ConfigCoreDump
@@ -21,10 +21,6 @@
             'source_upstream': self.version.upstream,
             'major': self.version.linux_major,
             'abiname': self.abiname,
-            'linuxsupport_allversions':
-                ', '.join('linux-support-' + version
-                          for version
-                          in os.environ['ALL_KERNELVERSIONS'].split())
         }
 
         changelog_version = Changelog()[0].version
@@ -101,14 +97,6 @@
             makefile.add('binary-arch_%s' % arch, ['binary-arch_%s_extra' % arch])
             makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
 
-        packages.extend(
-            self.process_packages(self.templates['control.support.all'],
-                                  self.vars))
-
-        cmds = ["$(MAKE) -f debian/rules.real install-support-all DH_OPTIONS='-plinux-support-all' GENCONTROL_ARGS='-v%s'" % self.package_version]
-        makefile.add('binary-support-all', cmds = cmds)
-        makefile.add('binary-indep', ['binary-support-all'])
-
     def process_real_image(self, entry, fields, vars):
         entry = self.process_package(entry, vars)
         for key, value in fields.iteritems():

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Sun Sep  6 18:08:50 2009	(r14208)
+++ dists/sid/linux-latest-2.6/debian/changelog	Sun Sep  6 18:13:53 2009	(r14209)
@@ -1,9 +1,3 @@
-linux-latest-2.6 (21) UNRELEASED; urgency=low
-
-  * Add linux-support-all package to suport out-of-tree module building.
-
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 30 Aug 2009 15:08:48 +0100
-
 linux-latest-2.6 (20) unstable; urgency=low
 
   * Move into kernel section.

Modified: dists/sid/linux-latest-2.6/debian/rules
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules	Sun Sep  6 18:08:50 2009	(r14208)
+++ dists/sid/linux-latest-2.6/debian/rules	Sun Sep  6 18:13:53 2009	(r14209)
@@ -4,7 +4,7 @@
 include debian/rules.defs
 include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
 
-GENCONTROL = ALL_KERNELVERSIONS=$(ALL_KERNELVERSIONS) debian/bin/gencontrol.py
+GENCONTROL = debian/bin/gencontrol.py
 
 ifdef DEBIAN_KERNEL_BUILD_ANY
 binary-arch: binary-arch-all

Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.defs	Sun Sep  6 18:08:50 2009	(r14208)
+++ dists/sid/linux-latest-2.6/debian/rules.defs	Sun Sep  6 18:13:53 2009	(r14209)
@@ -1,2 +1 @@
 KERNELVERSION := 2.6.30-1
-EXTRA_KERNELVERSIONS := 2.6.29-1

Modified: dists/sid/linux-latest-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.real	Sun Sep  6 18:08:50 2009	(r14208)
+++ dists/sid/linux-latest-2.6/debian/rules.real	Sun Sep  6 18:13:53 2009	(r14209)
@@ -25,17 +25,3 @@
 	dh_testroot
 	dh_prep
 	$(MAKE) -f debian/rules.real install-base
-
-install-support-all:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs usr/src/linux-support-all/modules
-	dh_install debian/modules/gencontrol.py debian/modules/rules.* \
-		usr/src/linux-support-all/modules
-	cat debian/rules.defs \
-		>> debian/install-support-all/debian/modules/rules.defs
-	dh_installdirs usr/src/linux-support-all/modules/templates
-	dh_install debian/modules/templates/*.in \
-		usr/src/linux-support-all/modules/templates
-	$(MAKE) -f debian/rules.real install-base