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

[Bastian Blank]

Author: waldi
Date: 2005-08-23 15:17:44 +0000 (Tue, 23 Aug 2005)
New Revision: 4027

Removed:
   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/templates/control.headers.subarch.in
Log:
* debian/bin/gencontrol.py: Produce headers package for each subarch.
* debian/templates/control.headers.main.in: Fix commandline.
* debian/templates/control.headers.subarch.in: Remove.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 14:16:40 UTC (rev 4026)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 15:17:44 UTC (rev 4027)
@@ -278,13 +278,22 @@
     tree = read_template("tree")
     packages.append(process_real_tree(tree[0], changelog, vars))
 
-    headers_main = read_template("headers.main")
-    a = subarches_architecture[None].keys()
-    a.sort()
-    b = vars.copy()
-    b['arch'] = ' '.join(a)
-    packages.append(process_package(headers_main[0], b))
+    headers_subarch = read_template("headers.subarch")
 
+    subarch_list = subarches_architecture.keys()
+    subarch_list.sort()
+    for subarch in subarch_list:
+        subarch_vars = vars.copy()
+        if subarch is not None:
+            subarch_vars['subarch'] = '%s-' % subarch
+        else:
+            subarch_vars['subarch'] = ''
+
+        a = subarches_architecture[subarch].keys()
+        a.sort()
+        subarch_vars['arch'] = ' '.join(a)
+        packages.extend(process_packages(headers_subarch, subarch_vars))
+
     headers = read_template("headers")
     headers_latest = read_template("headers.latest")
     image = read_template("image")

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-23 14:16:40 UTC (rev 4026)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.main.in	2005-08-23 15:17:44 UTC (rev 4027)
@@ -1,17 +0,0 @@
-Package: linux-headers- at version@- at abiname@
-Architecture: @arch@
-Section: devel
-Priority: optional
-Depends: coreutils | fileutils (>= 4.0)
-Provides: linux-headers, linux-headers- at major@
-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. To obtain a complete set of headers you also need to install
- the linux-headers- at version@- at abiname@-(flavour) package, matching the
- flavour of the kernel you intend the build for. To obtain such a set for the
- currently running kernel it is sufficient to run a command
- .
- apt-get install linux-headers-$(uname -r)
- .
- and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@-(flavour).

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in	2005-08-23 14:16:40 UTC (rev 4026)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in	2005-08-23 15:17:44 UTC (rev 4027)
@@ -12,6 +12,6 @@
  flavour of the kernel you intend the build for. To obtain such a set for the
  currently running kernel it is sufficient to run a command
  .
- apt-get install linux-headers- at subarch@@version at -@abiname at -$(uname -r)
+ apt-get install linux-headers- at subarch@$(uname -r)
  .
- and it will be unpacked in /usr/src/linux-headers- at subarch@@version at -@abiname at -(flavour).
+ and it will be unpacked in /usr/src/linux-headers- at subarch@(flavour).