[linux] 01/02: linux-image-dbg: Revert changes to packaging of debug symbols
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sat Oct 1 22:20:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch jessie-backports
in repository linux.
commit fe43387cfd7cb7671dcb5443a33f64d70bdd03a4
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sat Oct 1 19:29:52 2016 +0100
linux-image-dbg: Revert changes to packaging of debug symbols
This reverts commits cf16dd6fec6ef8854aaeae5a7fd8bc9c215b1990,
5e52b9de5c14577e129d6138822bb8eaf660d6ab,
775cc1229e560e17079abc5f031ecf86578f8d0d,
6d39ffde84bffc65eff6e0b7184a816138853762,
9067a5df84b8b0d6037dec4f2dce6a57ca22f70d and
c0b958cd5f58fc89149adbc24e4daacae48ef4d8.
New-style dbgsym packages are not properly supported in
jessie-backports and get installed into the main archive. Since we
build them for all flavours this greatly increases the size of the
suite.
---
debian/bin/gencontrol.py | 2 +-
debian/changelog | 7 +++++++
debian/config/defines | 1 -
debian/rules.real | 11 +++--------
debian/templates/control.image-dbg.in | 6 ++++--
debian/templates/image-dbg.lintian-override.in | 2 +-
6 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 776642a..0537546 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -497,7 +497,7 @@ class Gencontrol(Base):
'debian/%s.%s' % (image_main['Package'], name))
if build_debug:
self._substitute_file('image-dbg.lintian-override', vars,
- 'debian/linux-image-%s%s-dbgsym.lintian-overrides' %
+ 'debian/linux-image-%s%s-dbg.lintian-overrides' %
(vars['abiname'], vars['localversion']))
def process_changelog(self):
diff --git a/debian/changelog b/debian/changelog
index f54bcde..9b4aa43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.7.5-1~bpo8+2) UNRELEASED; urgency=medium
+
+ * linux-image-dbg: Revert changes to packaging of debug symbols, as new-
+ style dbgsym packages are not properly supported in jessie-backports
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 01 Oct 2016 19:33:06 +0100
+
linux (4.7.5-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports:
diff --git a/debian/config/defines b/debian/config/defines
index 4c55ac1..c25a1ce 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -42,7 +42,6 @@ featuresets:
rt
[build]
-debug-info: true
# Enable module signing by default (implemented in the linux-signed package)
signed-modules: true
diff --git a/debian/rules.real b/debian/rules.real
index aa84953..1c14c71 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -197,6 +197,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
dh_installdocs $(INSTALLDOCS_ARGS)
endif
dh_installchangelogs
+ dh_strip
dh_compress
dh_fixperms
dh_installdeb
@@ -382,12 +383,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
dh_testroot
dh_prep
dh_installdirs 'boot'
-ifeq ($(IMAGE_FILE),vmlinux)
-# This is the unprocessed ELF image, so we need to strip debug symbols
- $(CROSS_COMPILE)objcopy --strip-debug '$(DIR)/vmlinux' $(INSTALL_DIR)/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
-else
install -m644 '$(DIR)/$(IMAGE_FILE)' $(INSTALL_DIR)/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
-endif
+$(MAKE_SELF) \
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt \
DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
@@ -406,7 +402,6 @@ endif
+$(MAKE_SELF) \
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug \
PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
- dh_strip --no-automatic-dbgsym
+$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Recommends='"$$( \
if grep -q '^CONFIG_SMP=y' $(DIR)/.config; then \
printf irqbalance,; \
@@ -432,7 +427,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug:
printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\nPACKAGE_NAME='$(PACKAGE_NAME)'\nPACKAGE_VERSION='$(SOURCEVERSION)'" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
-install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbgsym
+install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DEBUG_DIR = $(PACKAGE_DIR)/usr/lib/debug
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
@@ -464,7 +459,7 @@ endif
ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)
ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
- +$(MAKE_SELF) install-base GENCONTROL_ARGS='-DAuto-Built-Package=debug-symbols'
+ +$(MAKE_SELF) install-base
install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
diff --git a/debian/templates/control.image-dbg.in b/debian/templates/control.image-dbg.in
index c3c8d63..39cbe9c 100644
--- a/debian/templates/control.image-dbg.in
+++ b/debian/templates/control.image-dbg.in
@@ -1,6 +1,8 @@
-Package: linux-image- at abiname@@localversion at -dbgsym
+Package: linux-image- at abiname@@localversion at -dbg
Build-Profiles: <!stage1>
Depends: ${misc:Depends}
Section: debug
Priority: extra
-Description: Debug symbols for linux-image- at abiname@@localversion@
+Description: Debugging symbols for Linux @abiname@@localversion@
+ This package provides the detached debugging symbols for the Linux kernel
+ and modules in linux-image- at abiname@@localversion at .
diff --git a/debian/templates/image-dbg.lintian-override.in b/debian/templates/image-dbg.lintian-override.in
index 26c857a..3e1849d 100644
--- a/debian/templates/image-dbg.lintian-override.in
+++ b/debian/templates/image-dbg.lintian-override.in
@@ -1,2 +1,2 @@
# Kernel dbg packages contain a full image with debug data
-linux-image- at abiname@@localversion at -dbgsym: dbg-package-missing-depends
+linux-image- at abiname@@localversion at -dbg: dbg-package-missing-depends
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list