r4037 - in people/waldi/kernel/linux-2.6/debian: bin lib/python templates

[Bastian Blank]

Author: waldi
Date: 2005-08-23 20:05:05 +0000 (Tue, 23 Aug 2005)
New Revision: 4037

Added:
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in
Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py
Log:
Add support for linux-headers-$version-all package.
It is currently blocked by #324741.

* debian/bin/gencontrol.py: Update.
* debian/lib/python/debian_linux.py: Move none subarch to the beginning of the list.
* debian/templates/control.headers.main.in: Add.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 17:49:12 UTC (rev 4036)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 20:05:05 UTC (rev 4037)
@@ -244,7 +244,7 @@
               f.write(" %s\n" % k)
         f.write('\n')
 
-def process_real_arch(packages, makefile, config, arch, vars, makeflags):
+def process_real_arch(packages, makefile, config, arch, vars, makeflags, package_headers_main):
     config_entry = config[arch]
     vars.update(config_entry)
 
@@ -264,9 +264,9 @@
     makefile.append(("setup-%s-real:" % arch, cmds_setup))
 
     for subarch in config_entry['subarches']:
-        process_real_subarch(packages, makefile, config, arch, subarch, vars.copy(), makeflags.copy())
+        process_real_subarch(packages, makefile, config, arch, subarch, vars.copy(), makeflags.copy(), package_headers_main)
 
-def process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars, makeflags):
+def process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars, makeflags, package_headers_main):
     config_entry = config['-'.join((arch, subarch, flavour))]
     vars.update(config_entry)
 
@@ -297,6 +297,8 @@
             package['Architecture'] = (' ', [arch])
             packages.append(package)
 
+    package_headers_main['Depends'][1].append("%s [%s]" % (packages_own[1]['Package'], arch))
+
     for i in ('binary-arch', 'build', 'setup'):
         makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour), None))
         makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
@@ -309,6 +311,7 @@
     cmds_binary_arch = []
     cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
     cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
+    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-p%s'" % package_headers_main['Package'],))
     cmds_build = []
     cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
     cmds_setup = []
@@ -327,6 +330,13 @@
     tree = read_template("tree")
     packages.append(process_real_tree(tree[0], changelog, vars))
 
+    headers_main = read_template("headers.main")
+    package_headers_main = process_package(headers_main[0], vars)
+
+    if not packages.has_key(package_headers_main['Package']):
+        package_headers_main['Depends'] = (', ', [])
+        packages.append(package_headers_main)
+
     makeflags = {
         'VERSION': version['version'],
         'SOURCE_VERSION': version['source'],
@@ -341,7 +351,7 @@
     makefile.append(("binary-indep:", cmds_binary_indep))
 
     for arch in iter(config['base']['arches']):
-        process_real_arch(packages, makefile, config, arch, vars.copy(), makeflags.copy())
+        process_real_arch(packages, makefile, config, arch, vars.copy(), makeflags.copy(), package_headers_main)
 
     extra = read_template("extra")
     packages.extend(process_packages(extra, vars))
@@ -367,7 +377,7 @@
         makefile.append(("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch), None))
         makefile.append(("binary-arch-%s-extra:" % arch, cmds))
 
-def process_real_subarch(packages, makefile, config, arch, subarch, vars, makeflags):
+def process_real_subarch(packages, makefile, config, arch, subarch, vars, makeflags, package_headers_main):
     if subarch == 'none':
         vars['subarch'] = ''
         config_entry = config[arch]
@@ -378,15 +388,15 @@
 
     headers_subarch = read_template("headers.subarch")
 
-    package = process_package(headers_subarch[0], vars)
+    package_headers = process_package(headers_subarch[0], vars)
 
-    name = package['Package']
+    name = package_headers['Package']
     if packages.has_key(name):
-        package = packages.get(name)
-        package['Architecture'][1].append(arch)
+        package_headers = packages.get(name)
+        package_headers['Architecture'][1].append(arch)
     else:
-        package['Architecture'] = (' ', [arch])
-        packages.append(package)
+        package_headers['Architecture'] = (' ', [arch])
+        packages.append(package_headers)
 
     for i in ('binary-arch', 'build', 'setup'):
         makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch), None))
@@ -407,7 +417,7 @@
     makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
     for flavour in config_entry['flavours']:
-        process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars.copy(), makeflags.copy())
+        process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars.copy(), makeflags.copy(), package_headers_main)
 
 def main():
     changelog = read_changelog()

Modified: people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py	2005-08-23 17:49:12 UTC (rev 4036)
+++ people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py	2005-08-23 20:05:05 UTC (rev 4037)
@@ -64,7 +64,7 @@
         if flavours:
             for flavour in flavours:
                 self._read_flavour(arch, 'none', flavour, c)
-            subarches.append('none')
+            subarches.insert(0, 'none')
         t['subarches'] = subarches
 
     def _read_base(self):

Added: people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in	2005-08-23 17:49:12 UTC (rev 4036)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in	2005-08-23 20:05:05 UTC (rev 4037)
@@ -0,0 +1,8 @@
+Package: linux-headers- at version@-all
+Architecture: any
+Section: devel
+Priority: optional
+Description: Common architecture-specific header files for Linux kernel @version@
+ This package provides the (sub)architecture-specific common kernel header files
+ for Linux kernel version @version@, generally used for building out-of-tree
+ kernel modules.