[dpdk-stable] patch 'mk: do not install meson.build in usertools' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/11/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Kevin Traynor

---
>From cf96e8c18c0ae6560b910a56c095f1e1d92cf55c Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Tue, 27 Nov 2018 20:35:32 +0100
Subject: [PATCH] mk: do not install meson.build in usertools

[ upstream commit d80a21eb720b009da224c8a97879a00360b3066b ]

In commit 7dd34c71de2a ("usertools: install with meson") meson.build was
added in usertools directory and so it's copied to $(datadir)/usertools
with "make install".

This patch avoids to copy meson.build when installing usertools with
"make install".

Fixes: 7dd34c71de2a ("usertools: install with meson")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 mk/rte.sdkinstall.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 8296e6dbd..2d34b4e5a 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -100,6 +100,7 @@ install-runtime:
 		--exclude app/testacl --exclude app/testpipeline app | \
 	    tar -xf -      -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS)
-	$(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))
-	$(Q)cp $(CP_FLAGS) $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
+	$(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir)/usertools)
+	$(Q)tar -cf -      -C $(RTE_SDK) --exclude meson.build usertools | \
+	    tar -xf -      -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS)
 	$(Q)$(call rte_mkdir,      $(DESTDIR)$(sbindir))
 	$(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:07.511732554 +0000
+++ 0002-mk-do-not-install-meson.build-in-usertools.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,8 +1,10 @@
-From d80a21eb720b009da224c8a97879a00360b3066b Mon Sep 17 00:00:00 2001
+From cf96e8c18c0ae6560b910a56c095f1e1d92cf55c Mon Sep 17 00:00:00 2001
 From: Timothy Redaelli <tredaelli at redhat.com>
 Date: Tue, 27 Nov 2018 20:35:32 +0100
 Subject: [PATCH] mk: do not install meson.build in usertools
 
+[ upstream commit d80a21eb720b009da224c8a97879a00360b3066b ]
+
 In commit 7dd34c71de2a ("usertools: install with meson") meson.build was
 added in usertools directory and so it's copied to $(datadir)/usertools
 with "make install".
@@ -11,7 +13,6 @@
 "make install".
 
 Fixes: 7dd34c71de2a ("usertools: install with meson")
-Cc: stable at dpdk.org
 
 Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
 Acked-by: Luca Boccassi <bluca at debian.org>