diff options
Diffstat (limited to 'meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch')
| -rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch new file mode 100644 index 00000000..1c880cf1 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch | |||
| @@ -0,0 +1,79 @@ | |||
| 1 | From 2b0979ce523e33f8c2744f8c021b8722b7571a3d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 3 | Date: Thu, 21 Jul 2016 09:39:51 +0800 | ||
| 4 | Subject: [PATCH 2/2] dpdk: fix installation warning and issue | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [configuration] | ||
| 7 | |||
| 8 | Ensure that all compiled libs should be installed to correct location. | ||
| 9 | For cross compiling cp -r and extra tar flags used to avoid QA warning | ||
| 10 | [host-user-contaminated]. | ||
| 11 | Added excluded files from bin and removing mk file installation since it | ||
| 12 | is not needed as a part of image. | ||
| 13 | |||
| 14 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 15 | --- | ||
| 16 | mk/rte.sdkinstall.mk | 24 +++++++++++------------- | ||
| 17 | 1 file changed, 11 insertions(+), 13 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk | ||
| 20 | index 68e56b6..7674b47 100644 | ||
| 21 | --- a/mk/rte.sdkinstall.mk | ||
| 22 | +++ b/mk/rte.sdkinstall.mk | ||
| 23 | @@ -114,15 +114,13 @@ endif | ||
| 24 | |||
| 25 | install-runtime: | ||
| 26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) | ||
| 27 | - $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) | ||
| 28 | + $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir) | ||
| 29 | $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) | ||
| 30 | - $(Q)tar -cf - -C $O app --exclude 'app/*.map' \ | ||
| 31 | - --exclude 'app/cmdline*' --exclude app/test \ | ||
| 32 | - --exclude app/testacl --exclude app/testpipeline | \ | ||
| 33 | - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ | ||
| 34 | - --keep-newer-files --warning=no-ignore-newer | ||
| 35 | + $(Q)tar -cf - -C $O app | \ | ||
| 36 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ | ||
| 37 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer | ||
| 38 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | ||
| 39 | - $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) | ||
| 40 | + $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir) | ||
| 41 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) | ||
| 42 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk_nic_bind.py, \ | ||
| 43 | $(DESTDIR)$(sbindir)/dpdk_nic_bind) | ||
| 44 | @@ -130,7 +128,7 @@ install-runtime: | ||
| 45 | install-kmod: | ||
| 46 | ifneq ($(wildcard $O/kmod/*),) | ||
| 47 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) | ||
| 48 | - $(Q)cp -a $O/kmod/* $(DESTDIR)$(kerneldir) | ||
| 49 | + $(Q)cp -r $O/kmod/* $(DESTDIR)$(kerneldir) | ||
| 50 | endif | ||
| 51 | |||
| 52 | install-sdk: | ||
| 53 | @@ -139,10 +137,10 @@ install-sdk: | ||
| 54 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ | ||
| 55 | --keep-newer-files --warning=no-ignore-newer | ||
| 56 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) | ||
| 57 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) | ||
| 58 | - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | ||
| 59 | + $(Q)cp -r $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | ||
| 60 | $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) | ||
| 61 | - $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) | ||
| 62 | + $(Q)cp -r $O/.config $(DESTDIR)$(targetdir) | ||
| 63 | + $(Q)cp -r $(RTE_SDK)/examples/ethtool/lib/$(RTE_TARGET)/lib/* $(DESTDIR)$(libdir) | ||
| 64 | $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) | ||
| 65 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) | ||
| 66 | |||
| 67 | @@ -155,7 +153,7 @@ ifneq ($(wildcard $O/doc),) | ||
| 68 | endif | ||
| 69 | ifneq ($(wildcard $O/doc/*/*/*pdf),) | ||
| 70 | $(Q)$(call rte_mkdir, $(DESTDIR)$(docdir)/guides) | ||
| 71 | - $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides | ||
| 72 | + $(Q)cp -r $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides | ||
| 73 | endif | ||
| 74 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | ||
| 75 | - $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir) | ||
| 76 | + $(Q)cp -r $(RTE_SDK)/examples $(DESTDIR)$(datadir) | ||
| 77 | -- | ||
| 78 | 1.9.1 | ||
| 79 | |||