* debian/bin/gencontrol.py: Move debug setting into new build section.
* debian/config/amd64/defines, debian/config/i386/defines: Update. svn path=/dists/trunk/linux-2.6/; revision=18490
This commit is contained in:
parent
a4a27ffb31
commit
2aee5e44d4
|
@ -157,9 +157,9 @@ class Gencontrol(Base):
|
||||||
headers = self.templates["control.headers"]
|
headers = self.templates["control.headers"]
|
||||||
|
|
||||||
config_entry_base = self.config.merge('base', arch, featureset, flavour)
|
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_description = self.config.merge('description', arch, featureset, flavour)
|
||||||
config_entry_image = self.config.merge('image', 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)
|
config_entry_relations = self.config.merge('relations', arch, featureset, flavour)
|
||||||
|
|
||||||
compiler = config_entry_base.get('compiler', 'gcc')
|
compiler = config_entry_base.get('compiler', 'gcc')
|
||||||
|
@ -243,7 +243,7 @@ class Gencontrol(Base):
|
||||||
packages_own.append(package_headers)
|
packages_own.append(package_headers)
|
||||||
extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package'])
|
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:
|
if build_debug:
|
||||||
makeflags['DEBUG'] = True
|
makeflags['DEBUG'] = True
|
||||||
packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
|
packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
|
||||||
|
|
|
@ -5,14 +5,14 @@ flavours:
|
||||||
amd64
|
amd64
|
||||||
kernel-arch: x86
|
kernel-arch: x86
|
||||||
|
|
||||||
|
[build]
|
||||||
|
debug-info: true
|
||||||
|
|
||||||
[image]
|
[image]
|
||||||
bootloaders: grub-pc extlinux lilo
|
bootloaders: grub-pc extlinux lilo
|
||||||
configs:
|
configs:
|
||||||
kernelarch-x86/config
|
kernelarch-x86/config
|
||||||
|
|
||||||
[image-dbg]
|
|
||||||
enabled: true
|
|
||||||
|
|
||||||
[amd64_description]
|
[amd64_description]
|
||||||
hardware: 64-bit PCs
|
hardware: 64-bit PCs
|
||||||
hardware-long: PCs with AMD64 or Intel 64 processors
|
hardware-long: PCs with AMD64 or Intel 64 processors
|
||||||
|
|
|
@ -25,6 +25,9 @@ parts: up
|
||||||
configs:
|
configs:
|
||||||
kernelarch-x86/config-arch-32
|
kernelarch-x86/config-arch-32
|
||||||
|
|
||||||
|
[686-pae_build]
|
||||||
|
debug-info: true
|
||||||
|
|
||||||
[686-pae_description]
|
[686-pae_description]
|
||||||
hardware: modern PCs
|
hardware: modern PCs
|
||||||
hardware-long: PCs with one or more processors supporting PAE
|
hardware-long: PCs with one or more processors supporting PAE
|
||||||
|
@ -35,9 +38,6 @@ configs:
|
||||||
kernelarch-x86/config-arch-32
|
kernelarch-x86/config-arch-32
|
||||||
recommends: libc6-i686
|
recommends: libc6-i686
|
||||||
|
|
||||||
[686-pae_image-dbg]
|
|
||||||
enabled: true
|
|
||||||
|
|
||||||
[686-pae_xen]
|
[686-pae_xen]
|
||||||
dom0-support: true
|
dom0-support: true
|
||||||
flavours:
|
flavours:
|
||||||
|
|
Loading…
Reference in New Issue