Revert "Remove debug symbol packages from debian/control to work around dak bug"
This reverts commit 99d37f9b16
, 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.
This commit is contained in:
parent
39fa6fb0e9
commit
97dc926bb7
|
@ -416,6 +416,7 @@ class Gencontrol(Base):
|
||||||
|
|
||||||
if build_debug:
|
if build_debug:
|
||||||
makeflags['DEBUG'] = True
|
makeflags['DEBUG'] = True
|
||||||
|
packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
|
||||||
|
|
||||||
merge_packages(packages, packages_own + packages_dummy, arch)
|
merge_packages(packages, packages_own + packages_dummy, arch)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
linux (4.9.2-2) UNRELEASED; urgency=medium
|
linux (4.9.2-2) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
* [sparc64] Export memcpy and memset to modules again (fixes FTBFS)
|
* [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@decadent.org.uk> Thu, 12 Jan 2017 00:14:36 +0000
|
-- Ben Hutchings <ben@decadent.org.uk> Thu, 12 Jan 2017 00:14:36 +0000
|
||||||
|
|
||||||
|
|
|
@ -484,26 +484,7 @@ endif
|
||||||
ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
|
ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
|
||||||
mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)
|
mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)
|
||||||
ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
|
ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
|
||||||
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
|
+$(MAKE_SELF) install-base GENCONTROL_ARGS='-DAuto-Built-Package=debug-symbols'
|
||||||
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
|
|
||||||
|
|
||||||
install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
|
install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
|
||||||
install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
|
install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
Package: linux-image-@abiname@@localversion@-dbgsym
|
||||||
|
Build-Profiles: <!stage1>
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Section: debug
|
||||||
|
Priority: extra
|
||||||
|
Description: Debug symbols for linux-image-@abiname@@localversion@
|
Loading…
Reference in New Issue