From 94f19b438b711d0f4a72bc870e9e35003c840332 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 7 Jul 2015 16:25:17 +0000 Subject: [PATCH] DocBook: generate consistent IDs svn path=/dists/trunk/linux/; revision=22810 --- debian/changelog | 7 +++++++ .../all/docbook-generate-consistent-ids.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/bugfix/all/docbook-generate-consistent-ids.patch diff --git a/debian/changelog b/debian/changelog index 5011ad81c..6b5267f19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.1.1-1~exp2) UNRELEASED; urgency=medium + + * Fix more issues that prevent a reproducible build: + - linux-doc: DocBook: generate consistent IDs + + -- Ben Hutchings Tue, 07 Jul 2015 16:25:05 +0100 + linux (4.1.1-1~exp1) experimental; urgency=medium * New upstream release: http://kernelnewbies.org/Linux_4.1 diff --git a/debian/patches/bugfix/all/docbook-generate-consistent-ids.patch b/debian/patches/bugfix/all/docbook-generate-consistent-ids.patch new file mode 100644 index 000000000..cd5b78809 --- /dev/null +++ b/debian/patches/bugfix/all/docbook-generate-consistent-ids.patch @@ -0,0 +1,17 @@ +From: Ben Hutchings +Date: Tue, 07 Jul 2015 17:23:54 +0100 +Subject: DocBook: generate consistent IDs +Bug-Debian: https://bugs.debian.org/769844 + +Signed-off-by: Ben Hutchings +--- +--- a/Documentation/DocBook/Makefile ++++ b/Documentation/DocBook/Makefile +@@ -69,6 +69,7 @@ DOCPROC = $(objtree)/scripts/docproc + + XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl + XMLTOFLAGS += --skip-validation ++XMLTOFLAGS += --stringparam generate.consistent.ids=1 + + ### + # DOCPROC is used for two purposes: diff --git a/debian/patches/series b/debian/patches/series index 2f9aeee3b..e07a87e1b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -70,6 +70,7 @@ bugfix/all/net-mv643xx-disable-tso-by-default.patch debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch bugfix/all/make-highlights-deterministic-in-kernel-doc.patch bugfix/all/remove-timestamps-from-compressed-man-pages.patch +bugfix/all/docbook-generate-consistent-ids.patch # Miscellaneous features features/all/efi-autoload-efi-pstore.patch