[linux] 02/03: linux-doc: Copy source to build directory

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to annotated tag debian/4.10_rc6-1_exp1
in repository linux.

commit 3c80d83bb1f80afd30611aff708520c1d1488326
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jan 30 23:15:48 2017 +0000

    linux-doc: Copy source to build directory
    
    This is necessary to avoid creating files in source directory, which
    makes the linux-source package unclean (and unreproducible).
    
    Firstly, Python creates bytecode files alongside the module sources.
    We can and do exclude those, though.
    
    Secondly, starting with 4.10, Documentation/media/Makefile converts
    from dot to SVG and from SVG to PDF in the source directory.  These
    can't easily be excluded, as SVG is also used as a source format.
---
 debian/changelog  | 2 ++
 debian/rules.real | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9edb89..ea8cb6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ linux (4.10~rc6-1~exp1) UNRELEASED; urgency=medium
   * linux-doc: Update documentation file list for 4.10
   * linux-doc: Fix up symlinks to gzipped docs
   * debian/control: Add build-dependency on graphviz for documentation
+  * linux-doc: Copy source to build directory, to avoid creating files in
+    source directory
 
   [ Roger Shimizu ]
   * debian/copyright: Add GPL/X11 Dual License
diff --git a/debian/rules.real b/debian/rules.real
index 9685b05..1a6dc6f 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -192,10 +192,11 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
 
 $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
 $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
-	rm -rf $(DIR)
-	mkdir -p $(DIR)
-	+$(MAKE_CLEAN) O='$(CURDIR)/$(DIR)' xmldocs
-	+$(MAKE_CLEAN) O='$(CURDIR)/$(DIR)' htmldocs mandocs
+	mkdir -p '$(BUILD_DIR)'
+	rm -rf '$(DIR)'
+	$(call copy_source,$(DIR))
+	+$(MAKE_CLEAN) -C '$(DIR)' xmldocs
+	+$(MAKE_CLEAN) -C '$(DIR)' htmldocs mandocs
 	@$(stamp)
 
 install-base:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git