[kernel] r7195 - in dists/sid/linux-2.6/debian: arch/amd64/vserver arch/amd64/xen arch/i386/vserver arch/i386/xen arch/i386/xen-vserver lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sat Aug 19 15:34:19 2006
New Revision: 7195

Modified:
   dists/sid/linux-2.6/debian/arch/amd64/vserver/defines
   dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/defines
   dists/sid/linux-2.6/debian/arch/amd64/xen/defines
   dists/sid/linux-2.6/debian/arch/i386/vserver/defines
   dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines
   dists/sid/linux-2.6/debian/arch/i386/xen/defines
   dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py
   dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Log:
* debian/arch/amd64/vserver/defines, debian/arch/amd64/xen/defines,
  debian/arch/amd64/xen-vserver/defines, debian/arch/i386/vserver/defines,
  debian/arch/i386/xen/defines, debian/arch/i386/xen-vserver/defines:
  Remove unneeded definitions.
* debian/lib/python/debian_linux/config.py
  - Remove one warning.
  - Add special merge method for arch config.
* debian/lib/python/debian_linux/gencontrol.py: Use merged config entry.


Modified: dists/sid/linux-2.6/debian/arch/amd64/vserver/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/vserver/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/vserver/defines	Sat Aug 19 15:34:19 2006
@@ -5,6 +5,3 @@
 [image]
 recommends: util-vserver
 
-[amd64]
-class: AMD64
-longclass: all 64bit single- and multiprocessor AMD and Intel

Modified: dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/defines	Sat Aug 19 15:34:19 2006
@@ -6,7 +6,3 @@
 initramfs: false
 type: plain-xen
 
-[amd64]
-class: AMD64
-longclass: all 64bit single- and multiprocessor AMD and Intel
-

Modified: dists/sid/linux-2.6/debian/arch/amd64/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen/defines	Sat Aug 19 15:34:19 2006
@@ -6,7 +6,3 @@
 initramfs: false
 type: plain-xen
 
-[amd64]
-class: AMD64
-longclass: all 64bit single- and multiprocessor AMD and Intel
-

Modified: dists/sid/linux-2.6/debian/arch/i386/vserver/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/vserver/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/vserver/defines	Sat Aug 19 15:34:19 2006
@@ -6,11 +6,3 @@
 [image]
 recommends: util-vserver, libc6-i686
 
-[686]
-class: PPro/Celeron/PII/PIII/P4
-longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
-
-[k7]
-class: AMD K7
-longclass: 32bit AMD Duron/Athlon/AthlonXP
-

Modified: dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines	Sat Aug 19 15:34:19 2006
@@ -6,7 +6,3 @@
 recommends: libc6-xen
 type: plain-xen
 
-[686]
-class: PPro/Celeron/PII/PIII/P4
-longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
-

Modified: dists/sid/linux-2.6/debian/arch/i386/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen/defines	Sat Aug 19 15:34:19 2006
@@ -7,11 +7,3 @@
 recommends: libc6-xen
 type: plain-xen
 
-[686]
-class: PPro/Celeron/PII/PIII/P4
-longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
-
-[k7]
-class: AMD K7
-longclass: 32bit AMD Duron/Athlon/AthlonXP
-

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	Sat Aug 19 15:34:19 2006
@@ -143,8 +143,9 @@
 
     def _read_flavour(self, arch, subarch, flavour):
         if not self.has_key(('base', arch, subarch, flavour)):
-            import warnings
-            warnings.warn('No config entry for flavour %s, subarch %s, arch %s' % (flavour, subarch, arch), DeprecationWarning)
+            if subarch == 'none':
+                import warnings
+                warnings.warn('No config entry for flavour %s, subarch none, arch %s' % (flavour, arch), DeprecationWarning)
             self['base', arch, subarch, flavour] = {}
 
     def _read_subarch(self, arch, subarch):
@@ -167,6 +168,19 @@
         for flavour in flavours:
             self._read_flavour(arch, subarch, flavour)
 
+    def merge(self, section, arch = None, subarch = None, flavour = None):
+        ret = {}
+        ret.update(self.get((section,), {}))
+        if arch:
+            ret.update(self.get((section, arch), {}))
+        if subarch:
+            ret.update(self.get((section, arch, subarch), {}))
+        if flavour:
+            if subarch != 'none':
+                ret.update(self.get((section, arch, 'none', flavour), {}))
+            ret.update(self.get((section, arch, subarch, flavour), {}))
+        return ret
+
 class config_parser(object):
     __slots__ = 'configs', 'schema'
 

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sat Aug 19 15:34:19 2006
@@ -160,7 +160,7 @@
             makefile.append("%s-%s-%s-real:" % (i, arch, subarch))
 
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
-        config_entry = self.config['base', arch, subarch, flavour]
+        config_entry = self.config.merge('base', arch, subarch, flavour)
         vars.update(config_entry)
 
         if not vars.has_key('class'):