diff options
author | Shashwat Pandey <shashwatx.pandey@intel.com> | 2017-02-23 17:26:26 +0800 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2017-02-28 16:05:01 -0800 |
commit | 3d22362dcf015e039fb8f578d0c3bfecace82f18 (patch) | |
tree | 3449dc5f0e2f4dac41836f78023515a088964f88 /common | |
parent | 80ce6eb1d3eecd6c767df99edc35241a7e719190 (diff) | |
download | meta-intel-3d22362dcf015e039fb8f578d0c3bfecace82f18.tar.gz |
Updated the DPDK recipe from v16.11 to v17.02.
for dpdk v17.02 updated the existing patch and recipe as per the changes in the directory names.
Rename and modified the patch:
dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch
accordingly since this doesn't apply cleanly on top of dpdk v17.02
Modified .inc according to the change in directory names.
Signed-off-by: Shashwat Pandey <shashwatx.pandey@intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'common')
-rw-r--r-- | common/recipes-extended/dpdk/dpdk.inc | 12 | ||||
-rw-r--r-- | common/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch (renamed from common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch) | 40 | ||||
-rw-r--r-- | common/recipes-extended/dpdk/dpdk_17.02.bb (renamed from common/recipes-extended/dpdk/dpdk_16.11.bb) | 4 |
3 files changed, 30 insertions, 26 deletions
diff --git a/common/recipes-extended/dpdk/dpdk.inc b/common/recipes-extended/dpdk/dpdk.inc index 496dd97e..77bd4a8b 100644 --- a/common/recipes-extended/dpdk/dpdk.inc +++ b/common/recipes-extended/dpdk/dpdk.inc | |||
@@ -8,12 +8,12 @@ SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ | |||
8 | file://dpdk-16.07-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.11-dpdk-fix-installation-warning-and-issue.patch \ | ||
12 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ | 11 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ |
13 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ | 12 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ |
13 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ | ||
14 | " | 14 | " |
15 | 15 | ||
16 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" | 16 | COMPATIBLE_MACHINE = "intel-corei7-64" |
17 | 17 | ||
18 | # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. | 18 | # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. |
19 | # fuse is in meta-filesystems and qat is not yet upstreamed. | 19 | # fuse is in meta-filesystems and qat is not yet upstreamed. |
@@ -29,8 +29,8 @@ export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qa | |||
29 | export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" | 29 | export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" |
30 | export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" | 30 | export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" |
31 | 31 | ||
32 | RDEPENDS_${PN} += "python-subprocess" | 32 | RDEPENDS_${PN} += "python-subprocess dpdk-dev-libibverbs" |
33 | DEPENDS = "virtual/kernel" | 33 | DEPENDS = "virtual/kernel dpdk-dev-libibverbs" |
34 | do_configure[depends] += "virtual/kernel:do_shared_workdir" | 34 | do_configure[depends] += "virtual/kernel:do_shared_workdir" |
35 | 35 | ||
36 | inherit module | 36 | inherit module |
@@ -134,12 +134,12 @@ FILES_${PN}-dev += " \ | |||
134 | ${includedir} \ | 134 | ${includedir} \ |
135 | ${includedir}/${ARCHDIR} \ | 135 | ${includedir}/${ARCHDIR} \ |
136 | ${includedir}/exec-env \ | 136 | ${includedir}/exec-env \ |
137 | ${INSTALL_PATH}/scripts/ \ | 137 | ${INSTALL_PATH}/buildtools/ \ |
138 | ${INSTALL_PATH}/${RTE_TARGET}/include \ | 138 | ${INSTALL_PATH}/${RTE_TARGET}/include \ |
139 | ${INSTALL_PATH}/${RTE_TARGET}/lib \ | 139 | ${INSTALL_PATH}/${RTE_TARGET}/lib \ |
140 | " | 140 | " |
141 | 141 | ||
142 | FILES_${PN} += " ${INSTALL_PATH}/tools/ \ | 142 | FILES_${PN} += " ${INSTALL_PATH}/usertools/ \ |
143 | ${prefix}/sbin/ \ | 143 | ${prefix}/sbin/ \ |
144 | ${prefix}/bin/ \ | 144 | ${prefix}/bin/ \ |
145 | ${libdir}/ \ | 145 | ${libdir}/ \ |
diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch b/common/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch index f1f625d8..f5171674 100644 --- a/common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch +++ b/common/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 1dcd79d49b3ad987d6313a857a74fc9efbcd2667 Mon Sep 17 00:00:00 2001 | 1 | From 363817bf84286fc167e0c3c255a7fd522bf87d8c Mon Sep 17 00:00:00 2001 |
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2 | From: Shashwat Pandey <shashwatx.p@intel.com> |
3 | Date: Mon, 14 Nov 2016 10:35:51 +0800 | 3 | Date: Mon, 20 Feb 2017 15:46:22 +0800 |
4 | Subject: [PATCH] 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] |
@@ -11,16 +11,16 @@ For cross compiling cp -r and extra tar flags used to avoid QA warning | |||
11 | Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files | 11 | Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files |
12 | installation since it 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: Shashwat Pandey <shashwatx.p@intel.com> |
15 | --- | 15 | --- |
16 | mk/rte.sdkinstall.mk | 25 ++++++++++--------------- | 16 | mk/rte.sdkinstall.mk | 29 ++++++++++++++--------------- |
17 | 1 file changed, 10 insertions(+), 15 deletions(-) | 17 | 1 file changed, 14 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 7b0d8b5..d27125c 100644 | 20 | index dbac2a2..563954e 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 | @@ -115,16 +115,13 @@ endif | 23 | @@ -115,16 +115,17 @@ endif |
24 | 24 | ||
25 | install-runtime: | 25 | install-runtime: |
26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) | 26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) |
@@ -37,12 +37,16 @@ index 7b0d8b5..d27125c 100644 | |||
37 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ | 37 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ |
38 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer | 38 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer |
39 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | 39 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) |
40 | - $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir) | 40 | - $(Q)cp -a $(RTE_SDK)/usertools $(DESTDIR)$(datadir) |
41 | + $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir) | 41 | + $(Q)cp -r $(RTE_SDK)/usertools $(DESTDIR)$(datadir) |
42 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \ | 42 | + $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-setup.sh, \ |
43 | $(DESTDIR)$(datadir)/tools/setup.sh) | 43 | + $(DESTDIR)$(datadir)/usertools/setup.sh) |
44 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ | 44 | + $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ |
45 | @@ -146,7 +143,7 @@ endif | 45 | + $(DESTDIR)$(datadir)/usertools/dpdk_nic_bind.py) |
46 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) | ||
47 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ | ||
48 | $(DESTDIR)$(sbindir)/dpdk-devbind) | ||
49 | @@ -142,7 +143,7 @@ endif | ||
46 | install-kmod: | 50 | install-kmod: |
47 | ifneq ($(wildcard $O/kmod/*),) | 51 | ifneq ($(wildcard $O/kmod/*),) |
48 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) | 52 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) |
@@ -51,22 +55,22 @@ index 7b0d8b5..d27125c 100644 | |||
51 | endif | 55 | endif |
52 | 56 | ||
53 | install-sdk: | 57 | install-sdk: |
54 | @@ -155,11 +152,9 @@ install-sdk: | 58 | @@ -151,11 +152,9 @@ install-sdk: |
55 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ | 59 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ |
56 | --keep-newer-files | 60 | --keep-newer-files |
57 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) | 61 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) |
58 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) | 62 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) |
59 | - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | 63 | - $(Q)cp -a $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) |
60 | - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) | 64 | - $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) |
61 | - $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) | 65 | - $(Q)cp -a $O/.config $(DESTDIR)$(targetdir) |
62 | - $(Q)cp -a $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app | 66 | - $(Q)cp -a $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app |
63 | + $(Q)cp -r $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | 67 | + $(Q)cp -r $(RTE_SDK)/buildtools $(DESTDIR)$(sdkdir) |
64 | + $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) | 68 | + $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)) |
65 | + $(Q)cp -r $O/.config $(DESTDIR)$(targetdir) | 69 | + $(Q)cp -r $O/.config $(DESTDIR)$(targetdir) |
66 | $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) | 70 | $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) |
67 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) | 71 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) |
68 | 72 | ||
69 | @@ -175,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) | 73 | @@ -171,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) |
70 | $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides | 74 | $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides |
71 | endif | 75 | endif |
72 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | 76 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) |
diff --git a/common/recipes-extended/dpdk/dpdk_16.11.bb b/common/recipes-extended/dpdk/dpdk_17.02.bb index 5617f10a..05b4b1cb 100644 --- a/common/recipes-extended/dpdk/dpdk_16.11.bb +++ b/common/recipes-extended/dpdk/dpdk_17.02.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] = "f51ffc862a4f57b0030ca5d7ff07fef0" | 8 | SRC_URI[dpdk.md5sum] = "9ac25cffecbf550e145c45e53db03a3d" |
9 | SRC_URI[dpdk.sha256sum] = "8098b3542b4c78d28bde5f4eba57d4ee929fffaaa941b7afd2b881eae0b45c00" | 9 | SRC_URI[dpdk.sha256sum] = "b07b546e910095174bdb6152bb0d7ce057cc4b79aaa74771aeee4e8a7219fb38" |
10 | 10 | ||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | 11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" |
12 | export ARCHDIR = "generic" | 12 | export ARCHDIR = "generic" |