From ab3c0154f7a2fc432dda13c8f6c3eaff174dc767 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 27 Apr 2010 08:50:30 +0000 Subject: [PATCH] * 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. svn path=/dists/trunk/linux-2.6/; revision=15566 --- debian/bin/gencontrol.py | 8 ++++++++ debian/lib/python/debian_linux/config.py | 3 +++ debian/templates/control.image-dbg.in | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 debian/templates/control.image-dbg.in diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 4c972d10f..d968c2f45 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -111,6 +111,7 @@ class Gencontrol(Base): 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 @@ class Gencontrol(Base): 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 @@ class Gencontrol(Base): 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: diff --git a/debian/lib/python/debian_linux/config.py b/debian/lib/python/debian_linux/config.py index 478c310db..0090032a8 100644 --- a/debian/lib/python/debian_linux/config.py +++ b/debian/lib/python/debian_linux/config.py @@ -121,6 +121,9 @@ class ConfigCoreHierarchy(ConfigCore): 'initramfs': SchemaItemBoolean(), 'initramfs-generators': SchemaItemList(), }, + 'image-dbg': { + 'enabled': SchemaItemBoolean(), + }, 'relations': { }, 'xen': { diff --git a/debian/templates/control.image-dbg.in b/debian/templates/control.image-dbg.in new file mode 100644 index 000000000..781e2dd2c --- /dev/null +++ b/debian/templates/control.image-dbg.in @@ -0,0 +1,3 @@ +Package: linux-image-@upstreamversion@@abiname@@localversion@-dbg +Description: Debugging infos for Linux @upstreamversion@@abiname@@localversion@ + TODO