summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <tredaelli@redhat.com>2018-11-27 20:35:32 +0100
committerThomas Monjalon <thomas@monjalon.net>2018-12-19 00:59:13 +0100
commitd80a21eb720b009da224c8a97879a00360b3066b (patch)
treeb98bc325fe7653238143c7b9f994f2bea226c8d0
parent592a13c9e6739b07e6657def5df5cd1e7abe2423 (diff)
downloaddpdk-d80a21eb720b009da224c8a97879a00360b3066b.zip
dpdk-d80a21eb720b009da224c8a97879a00360b3066b.tar.gz
dpdk-d80a21eb720b009da224c8a97879a00360b3066b.tar.xz
mk: do not install meson.build in usertools
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") Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Acked-by: Luca Boccassi <bluca@debian.org>
-rw-r--r--mk/rte.sdkinstall.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 8296e6d..2d34b4e 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -99,8 +99,9 @@ install-runtime:
--exclude 'app/cmdline*' --exclude app/test \
--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, \
$(DESTDIR)$(sbindir)/dpdk-devbind)