[kernel] r18490 - in dists/trunk/linux-2.6/debian: bin config/amd64 config/i386
Bastian Blank
waldi at alioth.debian.org
Wed Jan 11 17:05:45 UTC 2012
Author: waldi
Date: Wed Jan 11 17:05:44 2012
New Revision: 18490
Log:
* debian/bin/gencontrol.py: Move debug setting into new build section.
* debian/config/amd64/defines, debian/config/i386/defines: Update.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/config/amd64/defines
dists/trunk/linux-2.6/debian/config/i386/defines
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Wed Jan 11 17:00:17 2012 (r18489)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Wed Jan 11 17:05:44 2012 (r18490)
@@ -157,9 +157,9 @@
headers = self.templates["control.headers"]
config_entry_base = self.config.merge('base', arch, featureset, flavour)
+ config_entry_build = self.config.merge('build', 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')
@@ -243,7 +243,7 @@
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')
+ build_debug = config_entry_build.get('debug-info')
if build_debug:
makeflags['DEBUG'] = True
packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines Wed Jan 11 17:00:17 2012 (r18489)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines Wed Jan 11 17:05:44 2012 (r18490)
@@ -5,14 +5,14 @@
amd64
kernel-arch: x86
+[build]
+debug-info: true
+
[image]
bootloaders: grub-pc extlinux lilo
configs:
kernelarch-x86/config
-[image-dbg]
-enabled: true
-
[amd64_description]
hardware: 64-bit PCs
hardware-long: PCs with AMD64 or Intel 64 processors
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines Wed Jan 11 17:00:17 2012 (r18489)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Wed Jan 11 17:05:44 2012 (r18490)
@@ -25,6 +25,9 @@
configs:
kernelarch-x86/config-arch-32
+[686-pae_build]
+debug-info: true
+
[686-pae_description]
hardware: modern PCs
hardware-long: PCs with one or more processors supporting PAE
@@ -35,9 +38,6 @@
kernelarch-x86/config-arch-32
recommends: libc6-i686
-[686-pae_image-dbg]
-enabled: true
-
[686-pae_xen]
dom0-support: true
flavours:
More information about the Kernel-svn-changes
mailing list