Merge /dists/sid/linux-2.6.

svn path=/dists/trunk/linux-2.6/; revision=10251

debian/bin/gencontrol.py

@@ -27,9 +27,9 @@ class Gencontrol(Base):
         packages.extend(self.process_packages(self.templates["control.support"], self.vars))
 
     def do_arch_setup(self, vars, makeflags, arch, extra):
-        config_base = self.config.get(('base', arch), {})
+        config_base = self.config.merge('base', arch)
-        vars.update(self.config.get(('image', arch), {}))
+        vars.update(self.config.merge('image', arch))
-        config_libc_dev = self.config.get(('libc-dev', arch), {})
+        config_libc_dev = self.config.merge('libc-dev', arch)
         makeflags['LIBC_DEV_ARCH'] = config_libc_dev.get('arch', config_base.get('kernel-arch'))
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
@@ -56,7 +56,7 @@ class Gencontrol(Base):
         makefile.add('source_%s_real' % arch, cmds = cmds_source)
 
     def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
-        vars.update(self.config.get(('image', arch, featureset), {}))
+        vars.update(self.config.merge('image', arch, featureset))
         makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers'] = vars['localversion']
         makeflags['KERNEL_HEADER_DIRS'] = vars.get('kernel-header-dirs', vars.get('kernel-arch'))
 
@@ -78,7 +78,7 @@ class Gencontrol(Base):
         makefile.add('source_%s_%s_real' % (arch, featureset), cmds = cmds_source)
 
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
-        vars.update(self.config.get(('image', arch, featureset, flavour), {}))
+        vars.update(self.config.merge('image', arch, featureset, flavour))
         for i in (
             ('cflags', 'CFLAGS'),
             ('compiler', 'COMPILER'),

debian/changelog

@@ -12,7 +12,15 @@ linux-2.6 (2.6.24-1~experimental.2) UNRELEASED; urgency=low
 
  -- maximilian attems <maks@debian.org>  Mon, 28 Jan 2008 15:51:59 +0100
 
-linux-2.6 (2.6.24-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.24-2) UNRELEASED; urgency=low
+
+  * Fix broken merge of flavour specific settings.
+    - [i386]: Recommends are fixed.
+    - [s390/s390-tape]: Built as small image again.
+
+ -- Bastian Blank <waldi@debian.org>  Mon, 28 Jan 2008 17:48:04 +0100
+
+linux-2.6 (2.6.24-1) unstable; urgency=low
 
   * New upstream release
     (closes: #461639)
@@ -43,7 +51,7 @@ linux-2.6 (2.6.24-1~experimental.1) UNRELEASED; urgency=low
     written by Christian Hohnstaedt to the driver written by Krzysztof
     Hasala which has partially been accepted upstream.
 
- -- Gordon Farquharson <gordonfarquharson@gmail.com>  Sat, 26 Jan 2008 01:00:47 -0700
+ -- Bastian Blank <waldi@debian.org>  Sat, 26 Jan 2008 11:35:11 +0100
 
 linux-2.6 (2.6.24~rc8-1~experimental.1) experimental; urgency=low
 

debian/config/i386/xen/defines

@@ -4,7 +4,6 @@ flavours:
 
 [image]
 initramfs-generators: initramfs-tools
-recommends: libc6-xen
 suggests: grub
 type: plain-xen
 
@@ -18,4 +17,5 @@ longclass: i686 and compatible
 [686_image]
 configs:
   i386/config.686-bigmem
+recommends: libc6-xen
 

debian/lib/python/debian_linux/config.py

@@ -224,7 +224,7 @@ class ConfigParser(object):
 
 if __name__ == '__main__':
     import sys
-    config = ConfigReaderCore(['debian/config'])
+    config = ConfigCoreHierarchy(['debian/config'])
     sections = config.keys()
     sections.sort()
     for section in sections: