From b100ac012c1860b7fed6dd5322afc49edd6d7983 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Sep 2018 16:53:13 +0100 Subject: [PATCH] linux-headers: Stop linking the doc directory, which is not binNMU-safe Since the linux-headers-common package was changed to be architecture-independent, it won't include any binNMU changelog fragment that should be installed for a per-flavour linux-headers package. --- debian/changelog | 1 + debian/rules.real | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ea9404e2..915edecb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ linux (4.18.6-2) UNRELEASED; urgency=medium * [x86] wireless: Enable R8822BE as module (Closes: #908330) * Move all patch generation scripts to debian/bin * [rt] genpatch-rt: Store patches and series file in debian/patches-rt + * linux-headers: Stop linking the doc directory, which is not binNMU-safe [ Salvatore Bonaccorso ] * mac80211: don't update the PM state of a peer upon a multicast frame diff --git a/debian/rules.real b/debian/rules.real index 422393a28..f7b5cbe5d 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -229,7 +229,7 @@ endif install-base: ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) - dh_installdocs $(INSTALLDOCS_ARGS) + dh_installdocs endif dh_installchangelogs dh_compress @@ -366,7 +366,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$( ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build ln -s /usr/src/$(PACKAGE_NAME_COMMON) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source - +$(MAKE_SELF) install-base INSTALLDOCS_ARGS="--link-doc=$(PACKAGE_NAME_COMMON)" + +$(MAKE_SELF) install-base install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)