[kernel] r10251 - in dists/trunk/linux-2.6: . debian debian/bin debian/config/i386/xen debian/lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Tue Jan 29 13:13:47 UTC 2008
Author: waldi
Date: Tue Jan 29 13:13:46 2008
New Revision: 10251
Log:
Merge /dists/sid/linux-2.6.
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/i386/xen/defines
dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Tue Jan 29 13:13:46 2008
@@ -27,9 +27,9 @@
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), {})
- vars.update(self.config.get(('image', arch), {}))
- config_libc_dev = self.config.get(('libc-dev', arch), {})
+ config_base = self.config.merge('base', arch)
+ vars.update(self.config.merge('image', 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 @@
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 @@
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'),
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Tue Jan 29 13:13:46 2008
@@ -12,7 +12,15 @@
-- maximilian attems <maks at 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 at 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 @@
written by Christian Hohnstaedt to the driver written by Krzysztof
Hasala which has partially been accepted upstream.
- -- Gordon Farquharson <gordonfarquharson at gmail.com> Sat, 26 Jan 2008 01:00:47 -0700
+ -- Bastian Blank <waldi at debian.org> Sat, 26 Jan 2008 11:35:11 +0100
linux-2.6 (2.6.24~rc8-1~experimental.1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/defines (original)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/defines Tue Jan 29 13:13:46 2008
@@ -4,7 +4,6 @@
[image]
initramfs-generators: initramfs-tools
-recommends: libc6-xen
suggests: grub
type: plain-xen
@@ -18,4 +17,5 @@
[686_image]
configs:
i386/config.686-bigmem
+recommends: libc6-xen
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Tue Jan 29 13:13:46 2008
@@ -224,7 +224,7 @@
if __name__ == '__main__':
import sys
- config = ConfigReaderCore(['debian/config'])
+ config = ConfigCoreHierarchy(['debian/config'])
sections = config.keys()
sections.sort()
for section in sections:
More information about the Kernel-svn-changes
mailing list