[linux] 01/01: Revert "Remove debug symbol packages from debian/control to work around dak bug"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 97dc926bb76be4251aad479a7717c26c7f83acbe
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jan 12 15:44:11 2017 +0000

    Revert "Remove debug symbol packages from debian/control to work around dak bug"
    
    This reverts commit 99d37f9b167059eff67405745834e6921ce12424, which
    caused most binary uploads to be rejected.  dak's allows upload of
    debug symbol packages not listed in the Binary field only if there is
    a corresponding binary package without the -dbgsym suffix, which is
    not the case on architectures where we use a -unsigned suffix.
---
 debian/bin/gencontrol.py              |  1 +
 debian/changelog                      |  2 ++
 debian/rules.real                     | 21 +--------------------
 debian/templates/control.image-dbg.in |  6 ++++++
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index a1f2253..1eeda45 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -416,6 +416,7 @@ class Gencontrol(Base):
 
         if build_debug:
             makeflags['DEBUG'] = True
+            packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
 
         merge_packages(packages, packages_own + packages_dummy, arch)
 
diff --git a/debian/changelog b/debian/changelog
index e575026..659dca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 linux (4.9.2-2) UNRELEASED; urgency=medium
 
   * [sparc64] Export memcpy and memset to modules again (fixes FTBFS)
+  * Revert "Remove debug symbol packages from debian/control to work around dak
+    bug", which caused most binary uploads to be rejected
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 12 Jan 2017 00:14:36 +0000
 
diff --git a/debian/rules.real b/debian/rules.real
index 899cb85..cecbac4 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -484,26 +484,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
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
-	dh_installdocs
-endif
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-# Workaround for dak bug: any packages listed in debian/control that
-# are not installed in the main archive will always be seen as NEW.
-# So we use the same hack as debhelper: start with the control stanza
-# for the corresponding package and replace almost all fields.
-	dpkg-gencontrol -p$(IMAGE_PACKAGE_NAME) -ldebian/changelog \
-		-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-		-UPre-Depends -URecommends -USuggests -UProvides -UConflicts \
-		-DPriority=extra -DAuto-Built-Package=debug-symbols \
-		-DPackage=$(PACKAGE_NAME) -UDepends \
-		-DDescription='Debug symbols for linux-image-$(REAL_VERSION)' \
-		-DSection=debug -UMulti-Arch -UReplaces -UBreaks
-	dh_md5sums
-	dh_builddeb -- -Zxz
+	+$(MAKE_SELF) install-base GENCONTROL_ARGS='-DAuto-Built-Package=debug-symbols'
 
 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
new file mode 100644
index 0000000..c3c8d63
--- /dev/null
+++ b/debian/templates/control.image-dbg.in
@@ -0,0 +1,6 @@
+Package: linux-image- at abiname@@localversion at -dbgsym
+Build-Profiles: <!stage1>
+Depends: ${misc:Depends}
+Section: debug
+Priority: extra
+Description: Debug symbols for linux-image- at abiname@@localversion@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git