diff --git a/debian/changelog b/debian/changelog index 02d3a745b..55ee7365b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ linux (4.7~rc7-1~exp1) UNRELEASED; urgency=medium * [x86] KASLR, power: Remove x86 hibernation restrictions * fanotify: Enable FANOTIFY_ACCESS_PERMISSIONS (Closes: #690737) - Warn and taint kernel if this feature is actually used + * Define Auto-Built-Package field when running dpkg-gencontrol, as dpkg-source + doesn't like to see it in debian/control [ Bastian Blank ] * Mark debug symbols packages to move them into the debug archive. diff --git a/debian/rules.real b/debian/rules.real index c0cd09af4..bd0b36d44 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -458,7 +458,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 + +$(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 index 788eb091d..39cbe9c86 100644 --- a/debian/templates/control.image-dbg.in +++ b/debian/templates/control.image-dbg.in @@ -3,7 +3,6 @@ Build-Profiles: Depends: ${misc:Depends} Section: debug Priority: extra -Auto-Built-Package: debug-symbols Description: Debugging symbols for Linux @abiname@@localversion@ This package provides the detached debugging symbols for the Linux kernel and modules in linux-image-@abiname@@localversion@.