From 2b0979ce523e33f8c2744f8c021b8722b7571a3d Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Thu, 21 Jul 2016 09:39:51 +0800 Subject: [PATCH 2/2] dpdk: fix installation warning and issue Upstream-Status: Inappropriate [configuration] Ensure that all compiled libs should be installed to correct location. For cross compiling cp -r and extra tar flags used to avoid QA warning [host-user-contaminated]. Added excluded files from bin and removing mk file installation since it is not needed as a part of image. Signed-off-by: Rahul Kumar Gupta --- mk/rte.sdkinstall.mk | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 68e56b6..7674b47 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -114,15 +114,13 @@ endif install-runtime: $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) - $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) + $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) - $(Q)tar -cf - -C $O app --exclude 'app/*.map' \ - --exclude 'app/cmdline*' --exclude app/test \ - --exclude app/testacl --exclude app/testpipeline | \ - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ - --keep-newer-files --warning=no-ignore-newer + $(Q)tar -cf - -C $O app | \ + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ + --strip-components=1 --keep-newer-files --warning=no-ignore-newer $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) + $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir) $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk_nic_bind.py, \ $(DESTDIR)$(sbindir)/dpdk_nic_bind) @@ -130,7 +128,7 @@ install-runtime: install-kmod: ifneq ($(wildcard $O/kmod/*),) $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) - $(Q)cp -a $O/kmod/* $(DESTDIR)$(kerneldir) + $(Q)cp -r $O/kmod/* $(DESTDIR)$(kerneldir) endif install-sdk: @@ -139,10 +137,10 @@ install-sdk: tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ --keep-newer-files --warning=no-ignore-newer $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) + $(Q)cp -r $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) - $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) + $(Q)cp -r $O/.config $(DESTDIR)$(targetdir) + $(Q)cp -r $(RTE_SDK)/examples/ethtool/lib/$(RTE_TARGET)/lib/* $(DESTDIR)$(libdir) $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) @@ -155,7 +153,7 @@ ifneq ($(wildcard $O/doc),) endif ifneq ($(wildcard $O/doc/*/*/*pdf),) $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides) - $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides + $(Q)cp -r $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides endif $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir) + $(Q)cp -r $(RTE_SDK)/examples $(DESTDIR)$(datadir) -- 1.9.1