[kernel] r15566 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux templates

[Bastian Blank]

Author: waldi
Date: Tue Apr 27 08:50:30 2010
New Revision: 15566

Log:
* debian/bin/gencontrol.py: Add support for debug packages.
* debian/lib/python/debian_linux/config.py: Add image-dbg section.
* debian/templates/control.image-dbg.in: Add.

Added:
   dists/trunk/linux-2.6/debian/templates/control.image-dbg.in
Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   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	Tue Apr 27 08:43:41 2010	(r15565)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Tue Apr 27 08:50:30 2010	(r15566)
@@ -111,6 +111,7 @@
         config_entry_base = self.config.merge('base', arch, featureset, flavour)
         config_entry_description = self.config.merge('description', arch, featureset, flavour)
         config_entry_image = self.config.merge('image', arch, featureset, flavour)
+        config_entry_image_dbg = self.config.merge('image-dbg', arch, featureset, flavour)
         config_entry_relations = self.config.merge('relations', arch, featureset, flavour)
 
         compiler = config_entry_base.get('compiler', 'gcc')
@@ -185,6 +186,11 @@
             packages_own.append(package_headers)
             extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package'])
 
+        build_debug = config_entry_image_dbg.get('enabled')
+        if build_debug:
+            makeflags['DEBUG'] = True
+            packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
+
         self.merge_packages(packages, packages_own + packages_dummy, arch)
 
         if config_entry_image['type'] == 'plain-xen':
@@ -233,6 +239,8 @@
         kconfig.extend(check_config("%s/%s/config" % (arch, featureset), False, arch, featureset))
         kconfig.extend(check_config("%s/%s/config.%s" % (arch, featureset, flavour), False, arch, featureset, flavour))
         makeflags['KCONFIG'] = ' '.join(kconfig)
+        if build_debug:
+            makeflags['KCONFIG_OPTIONS'] = '-o DEBUG_INFO=y'
 
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags]
         if packages_dummy:

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	Tue Apr 27 08:43:41 2010	(r15565)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	Tue Apr 27 08:50:30 2010	(r15566)
@@ -121,6 +121,9 @@
             'initramfs': SchemaItemBoolean(),
             'initramfs-generators': SchemaItemList(),
         },
+        'image-dbg': {
+            'enabled': SchemaItemBoolean(),
+        },
         'relations': {
         },
         'xen': {

Added: dists/trunk/linux-2.6/debian/templates/control.image-dbg.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/templates/control.image-dbg.in	Tue Apr 27 08:50:30 2010	(r15566)
@@ -0,0 +1,3 @@
+Package: linux-image- at upstreamversion@@abiname@@localversion at -dbg
+Description: Debugging infos for Linux @upstreamversion@@abiname@@localversion@
+ TODO