Commit 9a6aa481 authored by Ben Hutchings's avatar Ben Hutchings

linux-image-dbg: Include debugging symbols for VDSOs

parent 1b7e85a2
...@@ -25,6 +25,7 @@ class Gencontrol(Base): ...@@ -25,6 +25,7 @@ class Gencontrol(Base):
'build': { 'build': {
'debug-info': config.SchemaItemBoolean(), 'debug-info': config.SchemaItemBoolean(),
'modules': config.SchemaItemBoolean(), 'modules': config.SchemaItemBoolean(),
'vdso': config.SchemaItemBoolean(),
}, },
'description': { 'description': {
'parts': config.SchemaItemList(), 'parts': config.SchemaItemList(),
...@@ -369,6 +370,9 @@ class Gencontrol(Base): ...@@ -369,6 +370,9 @@ class Gencontrol(Base):
if extra.get('headers_arch_depends'): if extra.get('headers_arch_depends'):
extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package']) extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package'])
if config_entry_build.get('vdso', False):
makeflags['VDSO'] = True
build_debug = config_entry_build.get('debug-info') build_debug = config_entry_build.get('debug-info')
if os.getenv('DEBIAN_KERNEL_DISABLE_DEBUG'): if os.getenv('DEBIAN_KERNEL_DISABLE_DEBUG'):
......
...@@ -9,6 +9,7 @@ linux (4.3.3-6) UNRELEASED; urgency=medium ...@@ -9,6 +9,7 @@ linux (4.3.3-6) UNRELEASED; urgency=medium
(Closes: #810472) (Closes: #810472)
* gpio: Enable GPIO_SYSFS wherever GPIOLIB is enabled (Closes: #810085) * gpio: Enable GPIO_SYSFS wherever GPIOLIB is enabled (Closes: #810085)
* [armhf] udeb: Include usbhid in input-modules (Closes: #809521) * [armhf] udeb: Include usbhid in input-modules (Closes: #809521)
* linux-image-dbg: Include debugging symbols for VDSOs
-- Ben Hutchings <ben@decadent.org.uk> Fri, 08 Jan 2016 12:08:13 +0000 -- Ben Hutchings <ben@decadent.org.uk> Fri, 08 Jan 2016 12:08:13 +0000
......
...@@ -8,6 +8,7 @@ kernel-arch: x86 ...@@ -8,6 +8,7 @@ kernel-arch: x86
[build] [build]
debug-info: true debug-info: true
image-file: arch/x86/boot/bzImage image-file: arch/x86/boot/bzImage
vdso: true
[image] [image]
bootloaders: grub-pc grub-efi extlinux bootloaders: grub-pc grub-efi extlinux
......
...@@ -6,6 +6,7 @@ featuresets: ...@@ -6,6 +6,7 @@ featuresets:
[build] [build]
debug-info: true debug-info: true
image-file: arch/arm64/boot/Image image-file: arch/arm64/boot/Image
vdso: true
[image] [image]
install-stem: vmlinuz install-stem: vmlinuz
......
...@@ -6,6 +6,7 @@ kernel-arch: arm ...@@ -6,6 +6,7 @@ kernel-arch: arm
[build] [build]
image-file: arch/arm/boot/zImage image-file: arch/arm/boot/zImage
vdso: true
[image] [image]
suggests: fdutils suggests: fdutils
......
...@@ -7,6 +7,7 @@ kernel-arch: x86 ...@@ -7,6 +7,7 @@ kernel-arch: x86
[build] [build]
image-file: arch/x86/boot/bzImage image-file: arch/x86/boot/bzImage
vdso: true
[description] [description]
part-long-pae: This kernel requires PAE (Physical Address Extension). part-long-pae: This kernel requires PAE (Physical Address Extension).
......
...@@ -7,6 +7,7 @@ kernel-arch: powerpc ...@@ -7,6 +7,7 @@ kernel-arch: powerpc
[build] [build]
image-file: vmlinux image-file: vmlinux
vdso: true
[image] [image]
configs: configs:
......
...@@ -5,6 +5,7 @@ kernel-arch: powerpc ...@@ -5,6 +5,7 @@ kernel-arch: powerpc
[build] [build]
image-file: vmlinux image-file: vmlinux
vdso: true
[image] [image]
suggests: mkvmlinuz suggests: mkvmlinuz
......
...@@ -5,6 +5,7 @@ kernel-arch: powerpc ...@@ -5,6 +5,7 @@ kernel-arch: powerpc
[build] [build]
image-file: vmlinux image-file: vmlinux
vdso: true
[image] [image]
configs: configs:
......
...@@ -5,6 +5,7 @@ kernel-arch: powerpc ...@@ -5,6 +5,7 @@ kernel-arch: powerpc
[build] [build]
image-file: vmlinux image-file: vmlinux
vdso: true
[image] [image]
configs: configs:
......
...@@ -5,6 +5,7 @@ kernel-arch: s390 ...@@ -5,6 +5,7 @@ kernel-arch: s390
[build] [build]
image-file: arch/s390/boot/image image-file: arch/s390/boot/image
vdso: true
[image] [image]
bootloaders: s390-tools bootloaders: s390-tools
......
...@@ -429,6 +429,17 @@ ifeq ($(MODULES),True) ...@@ -429,6 +429,17 @@ ifeq ($(MODULES),True)
find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+ find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+
rm $(DEBUG_DIR)/lib/firmware -rf rm $(DEBUG_DIR)/lib/firmware -rf
endif endif
ifeq ($(VDSO),True)
+$(MAKE_CLEAN) -C $(DIR) vdso_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
# Fix .build-id links
find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vdso/.build-id -name '*.debug' | while read link; do \
rel_path="$${link#$(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vdso/.build-id/}" && \
mkdir -p "$(DEBUG_DIR)/.build-id/$$(dirname "$$rel_path")" && \
ln -s -r -L "$$link" "$(DEBUG_DIR)/.build-id/$$rel_path" || \
exit; \
done
rm -r $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vdso/.build-id
endif
# Add symlinks to vmlinux from the locations expected by kdump-tools, # Add symlinks to vmlinux from the locations expected by kdump-tools,
# systemtap and others # systemtap and others
ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/ ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment