diff options
author | Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2016-09-07 11:24:09 +0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-09-08 12:49:29 -0500 |
commit | 9a06fc5bce051c47816d139184753ecdcc29987c (patch) | |
tree | 1e4e5f7dc5a3776b82c45ac2047f61c893fc906b | |
parent | 9a2d3d844c9650697846dc2bbfe5005af83e2af4 (diff) | |
download | meta-intel-9a06fc5bce051c47816d139184753ecdcc29987c.tar.gz |
meta-isg/dpdk: Update v16.04 -> v16.07
Update the dpdk recipe from v16.04 to v16.07. Renamed and modified
the patches:
dpdk-16.04-add-sysroot-option-within-app-makefile.patch
dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch
accordingly since these patches don't apply cleanly on top of
dpdk v16.07.
Fixed compilation by adding examples/ethtool/lib directory in
DEPDIRS-y and by adding lib path in LDLIBS.
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk.inc | 6 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch | 33 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch | 32 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch | 42 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch (renamed from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch) | 52 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk_16.07.bb (renamed from meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb) | 4 |
6 files changed, 105 insertions, 64 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index 6f3593bc..f9720291 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc | |||
@@ -5,11 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" | |||
5 | 5 | ||
6 | SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ | 6 | SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ |
7 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ | 7 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ |
8 | file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ | 8 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ |
9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ | 9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ |
10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ | 10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ |
11 | file://dpdk-16.04-dpdk-fix-installation-warning-and-issue.patch \ | 11 | file://dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch \ |
12 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ | 12 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ |
13 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" | 16 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" |
@@ -44,6 +45,7 @@ export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}" | |||
44 | export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}" | 45 | export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}" |
45 | export INSTALL_PATH = "${prefix}/share" | 46 | export INSTALL_PATH = "${prefix}/share" |
46 | export RTE_OUTPUT = "${S}/${RTE_TARGET}" | 47 | export RTE_OUTPUT = "${S}/${RTE_TARGET}" |
48 | export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/" | ||
47 | export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" | 49 | export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" |
48 | export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" | 50 | export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" |
49 | export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" | 51 | export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" |
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch deleted file mode 100644 index db762e9e..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 893d208cc66fbe533ab4e3e66907c5f63266579b Mon Sep 17 00:00:00 2001 | ||
2 | From: Ong Boon Leong <boon.leong.ong@intel.com> | ||
3 | Date: Thu, 2 Jul 2015 23:51:01 +0800 | ||
4 | Subject: [PATCH] dpdk: add --sysroot option within app makefile | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | rte.app.mk has been changed to add -Wl, to all items listed | ||
9 | under EXTRA_LDFLAGS. It causes --sysroot=<path> to not setup | ||
10 | correctly when we depends on gcc to setup for GNU ld. | ||
11 | |||
12 | Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> | ||
13 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
14 | --- | ||
15 | mk/rte.app.mk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/mk/rte.app.mk b/mk/rte.app.mk | ||
19 | index 8ecab41..35fcd8d 100644 | ||
20 | --- a/mk/rte.app.mk | ||
21 | +++ b/mk/rte.app.mk | ||
22 | @@ -186,7 +186,7 @@ ifeq ($(LINK_USING_CC),1) | ||
23 | override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) | ||
24 | O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \ | ||
25 | -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \ | ||
26 | - $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS)) | ||
27 | + $(EXTRA_LDFLAGS) $(SYSROOTPATH) $(call linkerprefix,$(LDLIBS)) | ||
28 | else | ||
29 | O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ | ||
30 | -Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS) | ||
31 | -- | ||
32 | 1.9.1 | ||
33 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch new file mode 100644 index 00000000..a4c47112 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From a33a9e7559b59bc5fb0988af85062436ec4389a4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
3 | Date: Fri, 19 Aug 2016 11:57:49 +0800 | ||
4 | Subject: [PATCH] dpdk: add --sysroot option within app makefile | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | rte.app.mk has been changed to add -Wl, to all items listed | ||
9 | under EXTRA_LDFLAGS. It causes --sysroot=<path> to not setup | ||
10 | correctly when we depends on gcc to setup for GNU ld. | ||
11 | |||
12 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
13 | --- | ||
14 | mk/rte.app.mk | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/mk/rte.app.mk b/mk/rte.app.mk | ||
18 | index eb28e11..296c8c7 100644 | ||
19 | --- a/mk/rte.app.mk | ||
20 | +++ b/mk/rte.app.mk | ||
21 | @@ -195,7 +195,7 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) | ||
22 | ifeq ($(LINK_USING_CC),1) | ||
23 | O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(OBJS-y) $(call linkerprefix, \ | ||
24 | $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ | ||
25 | - $(MAPFLAGS)) | ||
26 | + $(MAPFLAGS)) $(SYSROOTPATH) | ||
27 | else | ||
28 | O_TO_EXE = $(LD) -o $@ $(OBJS-y) \ | ||
29 | $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ | ||
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch new file mode 100644 index 00000000..e17d80d1 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 4cdcb5ea4af9677677a007c4f9b286948123be87 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
3 | Date: Fri, 2 Sep 2016 15:48:52 +0800 | ||
4 | Subject: [PATCH] dpdk: fix for parellel make issue | ||
5 | |||
6 | To make sure that the path of libraries should be correct and | ||
7 | libraries will be build before, And available at the time of | ||
8 | linking example apps. | ||
9 | |||
10 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
11 | --- | ||
12 | examples/Makefile | 1 + | ||
13 | examples/ethtool/ethtool-app/Makefile | 1 + | ||
14 | 2 files changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/examples/Makefile b/examples/Makefile | ||
17 | index 18b41b9..c7c2beb 100644 | ||
18 | --- a/examples/Makefile | ||
19 | +++ b/examples/Makefile | ||
20 | @@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor | ||
21 | ifneq ($(ICP_ROOT),) | ||
22 | DIRS-y += dpdk_qat | ||
23 | endif | ||
24 | +DEPDIRS-y += examples/ethtool/lib | ||
25 | DIRS-y += ethtool | ||
26 | DIRS-y += exception_path | ||
27 | DIRS-y += helloworld | ||
28 | diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile | ||
29 | index 09c66ad..ec068e6 100644 | ||
30 | --- a/examples/ethtool/ethtool-app/Makefile | ||
31 | +++ b/examples/ethtool/ethtool-app/Makefile | ||
32 | @@ -47,6 +47,7 @@ SRCS-y := main.c ethapp.c | ||
33 | CFLAGS += -O3 -D_GNU_SOURCE -pthread -I$(SRCDIR)/../lib | ||
34 | CFLAGS += $(WERROR_FLAGS) | ||
35 | |||
36 | +LDLIBS += -L$(ETHTOOL_LIB_PATH)/ | ||
37 | LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib | ||
38 | LDLIBS += -lrte_ethtool | ||
39 | |||
40 | -- | ||
41 | 1.9.1 | ||
42 | |||
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.07-dpdk-fix-installation-warning-and-issue.patch index 1c880cf1..9fc30381 100644 --- 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.07-dpdk-fix-installation-warning-and-issue.patch | |||
@@ -1,47 +1,48 @@ | |||
1 | From 2b0979ce523e33f8c2744f8c021b8722b7571a3d Mon Sep 17 00:00:00 2001 | 1 | From 7af593cfca897a0f17d33aba95dd3e3d22a65444 Mon Sep 17 00:00:00 2001 |
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
3 | Date: Thu, 21 Jul 2016 09:39:51 +0800 | 3 | Date: Fri, 19 Aug 2016 11:50:46 +0800 |
4 | Subject: [PATCH 2/2] dpdk: fix installation warning and issue | 4 | Subject: [PATCH] dpdk: fix installation warning and issue |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
7 | 7 | ||
8 | Ensure that all compiled libs should be installed to correct location. | 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 | 9 | For cross compiling cp -r and extra tar flags used to avoid QA warning |
10 | [host-user-contaminated]. | 10 | [host-user-contaminated]. |
11 | Added excluded files from bin and removing mk file installation since it | 11 | Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files |
12 | is not needed as a part of image. | 12 | installation since it is not needed as a part of image. |
13 | 13 | ||
14 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 14 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
15 | --- | 15 | --- |
16 | mk/rte.sdkinstall.mk | 24 +++++++++++------------- | 16 | mk/rte.sdkinstall.mk | 25 ++++++++++--------------- |
17 | 1 file changed, 11 insertions(+), 13 deletions(-) | 17 | 1 file changed, 10 insertions(+), 15 deletions(-) |
18 | 18 | ||
19 | diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk | 19 | diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk |
20 | index 68e56b6..7674b47 100644 | 20 | index 5217063..7036a32 100644 |
21 | --- a/mk/rte.sdkinstall.mk | 21 | --- a/mk/rte.sdkinstall.mk |
22 | +++ b/mk/rte.sdkinstall.mk | 22 | +++ b/mk/rte.sdkinstall.mk |
23 | @@ -114,15 +114,13 @@ endif | 23 | @@ -114,16 +114,13 @@ endif |
24 | 24 | ||
25 | install-runtime: | 25 | install-runtime: |
26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) | 26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) |
27 | - $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) | 27 | - $(Q)cp -a $O/lib/* $(DESTDIR)$(libdir) |
28 | + $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir) | 28 | + $(Q)cp -r $O/lib/* $(DESTDIR)$(libdir) |
29 | $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) | 29 | $(Q)$(call rte_mkdir, $(DESTDIR)$(bindir)) |
30 | - $(Q)tar -cf - -C $O app --exclude 'app/*.map' \ | 30 | - $(Q)tar -cf - -C $O --exclude 'app/*.map' \ |
31 | - --exclude app/dpdk-pmdinfogen \ | ||
31 | - --exclude 'app/cmdline*' --exclude app/test \ | 32 | - --exclude 'app/cmdline*' --exclude app/test \ |
32 | - --exclude app/testacl --exclude app/testpipeline | \ | 33 | - --exclude app/testacl --exclude app/testpipeline app | \ |
33 | - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ | 34 | - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ |
34 | - --keep-newer-files --warning=no-ignore-newer | 35 | - --keep-newer-files --warning=no-ignore-newer |
35 | + $(Q)tar -cf - -C $O app | \ | 36 | + $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \ |
36 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ | 37 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ |
37 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer | 38 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer |
38 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | 39 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) |
39 | - $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) | 40 | - $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) |
40 | + $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir) | 41 | + $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir) |
41 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) | 42 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \ |
42 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk_nic_bind.py, \ | 43 | $(DESTDIR)$(datadir)/tools/setup.sh) |
43 | $(DESTDIR)$(sbindir)/dpdk_nic_bind) | 44 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ |
44 | @@ -130,7 +128,7 @@ install-runtime: | 45 | @@ -137,7 +134,7 @@ install-runtime: |
45 | install-kmod: | 46 | install-kmod: |
46 | ifneq ($(wildcard $O/kmod/*),) | 47 | ifneq ($(wildcard $O/kmod/*),) |
47 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) | 48 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) |
@@ -50,26 +51,23 @@ index 68e56b6..7674b47 100644 | |||
50 | endif | 51 | endif |
51 | 52 | ||
52 | install-sdk: | 53 | install-sdk: |
53 | @@ -139,10 +137,10 @@ install-sdk: | 54 | @@ -146,11 +143,9 @@ install-sdk: |
54 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ | 55 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ |
55 | --keep-newer-files --warning=no-ignore-newer | 56 | --keep-newer-files --warning=no-ignore-newer |
56 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) | 57 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) |
57 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) | 58 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) |
58 | - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | 59 | - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) |
59 | + $(Q)cp -r $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | 60 | - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) |
60 | $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) | ||
61 | - $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) | 61 | - $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) |
62 | - $(Q)cp -a $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app | ||
63 | + $(Q)cp -r $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | ||
64 | + $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) | ||
62 | + $(Q)cp -r $O/.config $(DESTDIR)$(targetdir) | 65 | + $(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) | 66 | $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) |
65 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) | 67 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) |
66 | 68 | ||
67 | @@ -155,7 +153,7 @@ ifneq ($(wildcard $O/doc),) | 69 | @@ -166,4 +161,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) |
68 | endif | 70 | $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides |
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 | 71 | endif |
74 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | 72 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) |
75 | - $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir) | 73 | - $(Q)cp -a $(RTE_SDK)/examples $(DESTDIR)$(datadir) |
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_16.07.bb index 2cef10db..55729cd9 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_16.07.bb | |||
@@ -5,8 +5,8 @@ SRC_URI += "\ | |||
5 | file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ | 5 | file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRC_URI[dpdk.md5sum] = "0728d506d7f56eb64233e824fa3c098a" | 8 | SRC_URI[dpdk.md5sum] = "4afdc7951e21ff878a85ecade7f6f488" |
9 | SRC_URI[dpdk.sha256sum] = "d631495bc6e8d4c4aec72999ac03c3ce213bb996cb88f3bf14bb980dad1d3f7b" | 9 | SRC_URI[dpdk.sha256sum] = "cc982455a74357e465112bede5c29451b6eeb35f8c1c0dcea280dd3e7829f0e9" |
10 | 10 | ||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | 11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" |
12 | export ARCHDIR = "generic" | 12 | export ARCHDIR = "generic" |