[PATCH Trusty SRU] UBUNTU: [Debian] Fix linux-doc dangling symlinks

tim.gardner at canonical.com tim.gardner at canonical.com
Mon Mar 28 14:56:55 UTC 2016


From: Tim Gardner <tim.gardner at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/661306

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
Acked-by: Chris J Arges <chris.j.arges at canonical.com>
(cherry picked from commit 12d21ea5e531417dee745c36e501a3ec3a74e426)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---

It seems that this patch was missed for Trusty.

 debian/rules.d/3-binary-indep.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 5afbbf4..168a3b5 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -42,8 +42,9 @@ ifeq ($(do_doc_package_content),true)
 	if [ -z "$(AUTOBUILD)" ]; then \
 		install -d $(docdir)/$(doc_pkg_name)-tmp; \
 		$(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs; \
-		mv $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook \
-			$(docdir)/html; \
+		install -d $(docdir)/html; \
+		rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook/ \
+			$(docdir)/html/; \
 		rm -rf $(docdir)/$(doc_pkg_name)-tmp; \
 	fi
 endif
-- 
2.7.4





More information about the kernel-team mailing list