r4047 - in people/waldi/kernel/linux-2.6/debian: bin templates

[Bastian Blank]

Author: waldi
Date: 2005-08-24 08:31:57 +0000 (Wed, 24 Aug 2005)
New Revision: 4047

Added:
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.arch.in
Removed:
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in
Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
Log:
* debian/bin/gencontrol.py: Add proper Architecture line to headers package.
* debian/templates/control.headers.arch.in: Move from
  debian/templates/control.headers.main.in.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-24 03:37:01 UTC (rev 4046)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-24 08:31:57 UTC (rev 4047)
@@ -244,7 +244,7 @@
               f.write(" %s\n" % k)
         f.write('\n')
 
-def process_real_arch(packages, makefile, config, arch, vars, makeflags, package_headers_main):
+def process_real_arch(packages, makefile, config, arch, vars, makeflags):
     config_entry = config[arch]
     vars.update(config_entry)
 
@@ -253,6 +253,18 @@
             makefile.append(("%s-%s:" % (i, arch), ["@echo Architecture %s is not available!" % arch, "@exit 1"]))
         return
 
+    headers_arch = read_template("headers.arch")
+    package_headers_arch = process_package(headers_arch[0], vars)
+
+    name = package_headers_arch['Package']
+    if packages.has_key(name):
+        package_headers_arch = packages.get(name)
+        package_headers_arch['Architecture'][1].append(arch)
+    else:
+        package_headers_arch['Architecture'] = (' ', [arch])
+        package_headers_arch['Depends'] = (', ', [])
+        packages.append(package_headers_arch)
+
     for i in (('binary-arch', 'setup',)):
         makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
 
@@ -267,9 +279,9 @@
     makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
 
     for subarch in config_entry['subarches']:
-        process_real_subarch(packages, makefile, config, arch, subarch, vars.copy(), makeflags.copy(), package_headers_main)
+        process_real_subarch(packages, makefile, config, arch, subarch, vars.copy(), makeflags.copy(), package_headers_arch)
 
-def process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars, makeflags, package_headers_main):
+def process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars, makeflags, package_headers_arch):
     config_entry = config['-'.join((arch, subarch, flavour))]
     vars.update(config_entry)
 
@@ -300,7 +312,7 @@
             package['Architecture'] = (' ', [arch])
             packages.append(package)
 
-    package_headers_main['Depends'][1].append("%s [%s]" % (packages_own[1]['Package'], arch))
+    package_headers_arch['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))
@@ -332,13 +344,6 @@
     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'],
@@ -353,7 +358,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(), package_headers_main)
+        process_real_arch(packages, makefile, config, arch, vars.copy(), makeflags.copy())
 
     extra = read_template("extra")
     packages.extend(process_packages(extra, vars))
@@ -379,7 +384,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, package_headers_main):
+def process_real_subarch(packages, makefile, config, arch, subarch, vars, makeflags, package_headers_arch):
     if subarch == 'none':
         vars['subarch'] = ''
         config_entry = config[arch]
@@ -419,7 +424,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(), package_headers_main)
+        process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars.copy(), makeflags.copy(), package_headers_arch)
 
 def main():
     changelog = read_changelog()

Copied: people/waldi/kernel/linux-2.6/debian/templates/control.headers.arch.in (from rev 4038, 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 20:42:52 UTC (rev 4038)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.arch.in	2005-08-24 08:31:57 UTC (rev 4047)
@@ -0,0 +1,8 @@
+Package: linux-headers- at version@
+Section: devel
+Priority: optional
+Provides: linux-headers- at version@- at abiname@-all
+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.

Deleted: 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-24 03:37:01 UTC (rev 4046)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in	2005-08-24 08:31:57 UTC (rev 4047)
@@ -1,8 +0,0 @@
-Package: linux-headers- at version@
-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.