From c8050509621461b13324fbf7090c75002cbcfdcc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 24 Oct 2015 12:42:08 +0900 Subject: [PATCH] linux-manual: Fix regression in reproducibility in 4.2~rc8-1~exp1 --- debian/changelog | 1 + debian/rules.real | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1cb7c5a5d..91281a1f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -270,6 +270,7 @@ linux (4.2.4-1) UNRELEASED; urgency=medium VIDEO_GO7007_LOADER, VIDEO_GO7007_USB_S2250_BOARD as modules * net: Enable LIQUIDIO as module * [x86] Enable X86_AMD_PLATFORM_DEVICE + * linux-manual: Fix regression in reproducibility in 4.2~rc8-1~exp1 -- Salvatore Bonaccorso Mon, 19 Oct 2015 21:23:18 +0200 diff --git a/debian/rules.real b/debian/rules.real index 96bb5d316..9d4e20894 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -215,8 +215,14 @@ install-manual: DIR=$(BUILD_DIR)/build-doc install-manual: DH_OPTIONS = -p$(PACKAGE_NAME) install-manual: $(STAMPS_DIR)/build-doc dh_prep +# Some manual pages are generated multiple times with different +# metadata, and need to be de-duplicated. This matches what the +# upstream installmandocs target does, except that we use +# dh_installman. set -o pipefail; \ - find $(DIR)/Documentation/DocBook/man/ -name '*.9.gz' | xargs dh_installman + find $(DIR)/Documentation/DocBook/man/ -name '*.9.gz' -printf '%h %f\n' | \ + sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \ + xargs dh_installman +$(MAKE_SELF) install-base install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(ABINAME)-all linux-headers-$(ABINAME)-all-$(ARCH)