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

[Bastian Blank]

Author: waldi
Date: 2005-07-31 19:44:25 +0000 (Sun, 31 Jul 2005)
New Revision: 3650

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in
Log:
Generate Architecture field.

debian/bin/gencontrol.py, debian/templates/control.headers.in:
Update.


Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-07-31 19:12:49 UTC (rev 3649)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-07-31 19:44:25 UTC (rev 3650)
@@ -60,7 +60,6 @@
     for i in os.listdir(dir):
         if i not in ('.svn',) and os.path.isdir(os.path.join(dir, i)):
             ret.append(i)
-    ret.sort()
     return ret
 
 def list_files(dir):
@@ -68,7 +67,6 @@
     for i in os.listdir(dir):
         if os.path.isfile(os.path.join(dir, i)):
             ret.append(i)
-    ret.sort()
     return ret
 
 def list_arches():
@@ -261,6 +259,20 @@
     vars = vars_changelog(vars, changelog)
     vars.update(config().defaults())
 
+    arches = {}
+    subarches_architecture = {}
+    for arch in list_arches():
+        t1 = {}
+        for subarch in list_subarches(arch):
+            t2 = {}
+            for flavour in list_flavours(arch, subarch):
+                t2[flavour] = True
+            t1[subarch] = t2
+            t3 = subarches_architecture.get(subarch, {})
+            t3[arch] = True
+            subarches_architecture[subarch] = t3
+        arches[arch] = t1
+
     packages = []
 
     source = read_template("source")
@@ -273,23 +285,33 @@
     packages.append(process_real_tree(tree[0], changelog, vars))
 
     headers = read_template("headers")
-    packages.extend(process_entries(headers, vars))
+    a = subarches_architecture[None].keys()
+    a.sort()
+    b = vars.copy()
+    b['arch'] = ' '.join(a)
+    packages.extend(process_entries(headers, b))
 
     headers_flavour = read_template("headers.flavour")
     image = read_template("image")
 
-    for arch in list_arches():
+    i1 = arches.keys()
+    i1.sort()
+    for arch in i1:
         arch_vars = vars.copy()
         arch_vars['arch'] = arch
         arch_vars.update(config_arch(arch).defaults())
-        for subarch in list_subarches(arch):
+        i2 = arches[arch].keys()
+        i2.sort()
+        for subarch in i2:
             subarch_vars = arch_vars.copy()
             subarch_vars.update(config_subarch(arch, subarch).defaults())
             if subarch is not None:
                 subarch_vars['subarch'] = '%s-' % subarch
             else:
                 subarch_vars['subarch'] = ''
-            for flavour in list_flavours(arch, subarch):
+            i3 = arches[arch][subarch].keys()
+            i3.sort()
+            for flavour in i3:
                 flavour_vars = subarch_vars.copy()
                 flavour_vars['flavour'] = flavour
                 flavour_vars.update(config_flavour(arch, subarch, flavour).defaults())

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in	2005-07-31 19:12:49 UTC (rev 3649)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in	2005-07-31 19:44:25 UTC (rev 3650)
@@ -1,5 +1,5 @@
 Package: linux-headers- at version@- at abiname@
-Architecture: alpha amd64 arm hppa i386 ia64 m68k powerpc s390 sparc
+Architecture: @arch@
 Section: devel
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0)