Drop mk-fix-excluding-.doctrees-when-installing-docs.patch, merged upstream

Change-Id: I6bf1137a437b9e144cb01c438747a2a8d6098ebc
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

diff --git a/debian/patches/mk-fix-excluding-.doctrees-when-installing-docs.patch b/debian/patches/mk-fix-excluding-.doctrees-when-installing-docs.patch
deleted file mode 100644 (file)
index dee7477..0000000
--- a/debian/patches/mk-fix-excluding-.doctrees-when-installing-docs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: mk: fix excluding .doctrees when installing docs
-
-The --exclude parameter must be passed before the input directory to
-tar, otherwise it's silently ignored and the .doctrees directory is
-installed by make install-doc.
-
-Origin: http://dpdk.org/dev/patchwork/patch/25674/
-Forwarded: yes
-Author: Luca Boccassi <luca.boccassi@gmail.com>
-Last-Update: 2017-06-24
----
- mk/rte.sdkinstall.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
-index dbac2a277..4e97feff9 100644
---- a/mk/rte.sdkinstall.mk
-+++ b/mk/rte.sdkinstall.mk
-@@ -162,7 +162,7 @@ install-sdk:
- install-doc:
- ifneq ($(wildcard $O/doc/html),)
-       $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir))
--      $(Q)tar -cf -      -C $O/doc html --exclude 'html/guides/.*' | \
-+      $(Q)tar -cf -      -C $O/doc --exclude 'html/guides/.*' html | \
-           tar -xf -      -C $(DESTDIR)$(docdir) --strip-components=1 \
-               --keep-newer-files
- endif
--- 
-2.11.0
-

diff --git a/debian/patches/series b/debian/patches/series
index 81e8293..39bccbf 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix-vhost-user-socket-permission.patch
-mk-fix-excluding-.doctrees-when-installing-docs.patch
 mk-sort-list-of-shared-objects-in-linker-script.patch
 mk-sort-list-of-files-in-examples.dox.patch
 mk-sort-headers-before-wildcard-inclusion.patch