[dpdk-dev] mk: Fix cruft getting installed by "make install" with tar >= 1.29

Message ID f0f80994ec194191254d3cb371ca9529643955e7.1463982813.git.pmatilai@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Commit Message

Panu Matilainen May 23, 2016, 5:53 a.m. UTC
  --exclude became a positional option in tar 1.29, breaking the
test app filtering in "make install", causing .map files and all test
apps to get installed in bindir. Adjust the tar arguments accordingly,
this is compatible with older versions too since they do not care about
the order.

Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1337864

Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
---
 mk/rte.sdkinstall.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Thomas Monjalon June 10, 2016, 3:26 p.m. UTC | #1
2016-05-23 08:53, Panu Matilainen:
> --exclude became a positional option in tar 1.29, breaking the
> test app filtering in "make install", causing .map files and all test
> apps to get installed in bindir. Adjust the tar arguments accordingly,
> this is compatible with older versions too since they do not care about
> the order.
> 
> Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1337864
> 
> Signed-off-by: Panu Matilainen <pmatilai@redhat.com>

Fixes: 6b62a72a70d0 ("mk: install a standard cutomizable tree")

Applied, thanks
  

Patch

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 68e56b6..abdab0f 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -116,9 +116,9 @@  install-runtime:
 	$(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
 	$(Q)cp -a    $O/lib/* $(DESTDIR)$(libdir)
 	$(Q)$(call rte_mkdir, $(DESTDIR)$(bindir))
-	$(Q)tar -cf -      -C $O app  --exclude 'app/*.map' \
+	$(Q)tar -cf -      -C $O --exclude 'app/*.map' \
 		--exclude 'app/cmdline*' --exclude app/test \
-		--exclude app/testacl --exclude app/testpipeline | \
+		--exclude app/testacl --exclude app/testpipeline app | \
 	    tar -xf -      -C $(DESTDIR)$(bindir) --strip-components=1 \
 		--keep-newer-files --warning=no-ignore-newer
 	$(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))