diff options
author | Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2016-04-14 22:18:19 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2016-04-14 09:57:29 -0700 |
commit | c5650b6811f58c27d7d4493864b3ca859cf66cbd (patch) | |
tree | f61e1d461f029bec3b9f268a7d2734b491c3dcac /meta-isg | |
parent | b6c9d76e184c219cca688ad309841084615e315d (diff) | |
download | meta-intel-c5650b6811f58c27d7d4493864b3ca859cf66cbd.tar.gz |
meta-isg: dpdk: Update v2.2.0 -> v16.04
update the dpdk recipe from v2.2.0 to v16.04. Rename the patches
according to the recipe version.
Now dpdk is following 'year-month' format for version numbering.
dpdk v16.04 required "CONFIG_RTE_IP_FRAG=y" in order to build
ip_fragmentation application.
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-isg')
9 files changed, 52 insertions, 50 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index 6ae51d64..7dac817e 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc | |||
@@ -4,9 +4,9 @@ LICENSE = "BSD & LGPLv2 & GPLv2" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" | 4 | 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-2.2.0-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-2.2.0-add-sysroot-option-within-app-makefile.patch \ | 8 | file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ |
9 | file://dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch \ | 9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" | 12 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" |
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch index e446ce44..e446ce44 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch index cd517052..cd517052 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-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 index db762e9e..db762e9e 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-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 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch new file mode 100644 index 00000000..3719aa78 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From f7be643cc62860a986c9e0aec990c90bfc58a941 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
3 | Date: Fri, 1 Apr 2016 17:31:55 +0800 | ||
4 | Subject: [PATCH] dpdk: enable ip_fragmentation in common_base config | ||
5 | |||
6 | Upstream-Status: Inappropriate [Configuration] | ||
7 | |||
8 | This configuration need to set for ip_fragmentation application. | ||
9 | |||
10 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
11 | --- | ||
12 | config/common_base | 5 +++++ | ||
13 | 1 file changed, 5 insertions(+) | ||
14 | |||
15 | diff --git a/config/common_base b/config/common_base | ||
16 | index abd6a64..90259f0 100644 | ||
17 | --- a/config/common_base | ||
18 | +++ b/config/common_base | ||
19 | @@ -442,6 +442,11 @@ CONFIG_RTE_LIBRTE_POWER_DEBUG=n | ||
20 | CONFIG_RTE_MAX_LCORE_FREQS=64 | ||
21 | |||
22 | # | ||
23 | +# Compile ip_fragmentation | ||
24 | +# | ||
25 | +CONFIG_RTE_IP_FRAG=y | ||
26 | + | ||
27 | +# | ||
28 | # Compile librte_net | ||
29 | # | ||
30 | CONFIG_RTE_LIBRTE_NET=y | ||
31 | -- | ||
32 | 1.9.1 | ||
33 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib-path.patch index 75bb517d..75bb517d 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib-path.patch | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch deleted file mode 100644 index c4c683e8..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From ebf07e9708c96aa1e655127175c39ad6ae3fc5ae Mon Sep 17 00:00:00 2001 | ||
2 | From: WU CHIA CHUAN <chia.chuan.wu@intel.com> | ||
3 | Date: Tue, 28 Jul 2015 13:12:21 +0800 | ||
4 | Subject: [PATCH] dpdk enable ip_fragmentation in common_linuxapp config | ||
5 | |||
6 | Upstream-Status: Inappropriate [Configuration] | ||
7 | |||
8 | Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com> | ||
9 | --- | ||
10 | config/common_linuxapp | 5 +++++ | ||
11 | 1 file changed, 5 insertions(+) | ||
12 | |||
13 | diff --git a/config/common_linuxapp b/config/common_linuxapp | ||
14 | index 0b25f34..8cd97d7 100644 | ||
15 | --- a/config/common_linuxapp | ||
16 | +++ b/config/common_linuxapp | ||
17 | @@ -354,6 +354,11 @@ CONFIG_RTE_MAX_LCORE_FREQS=64 | ||
18 | CONFIG_RTE_LIBRTE_NET=y | ||
19 | |||
20 | # | ||
21 | +# Compile ip_fragmentation | ||
22 | +# | ||
23 | +CONFIG_RTE_IP_FRAG=y | ||
24 | + | ||
25 | +# | ||
26 | # Compile librte_ip_frag | ||
27 | # | ||
28 | CONFIG_RTE_LIBRTE_IP_FRAG=y | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb new file mode 100644 index 00000000..2cef10db --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | include dpdk.inc | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch \ | ||
5 | file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[dpdk.md5sum] = "0728d506d7f56eb64233e824fa3c098a" | ||
9 | SRC_URI[dpdk.sha256sum] = "d631495bc6e8d4c4aec72999ac03c3ce213bb996cb88f3bf14bb980dad1d3f7b" | ||
10 | |||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | ||
12 | export ARCHDIR = "generic" | ||
13 | |||
14 | do_configure_prepend () { | ||
15 | sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp | ||
16 | } | ||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb deleted file mode 100644 index ffb82679..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | include dpdk.inc | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch \ | ||
5 | file://dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[dpdk.md5sum] = "22e2fd68cd5504f43fe9a5a6fd6dd938" | ||
9 | SRC_URI[dpdk.sha256sum] = "77206ad93618ec93ef6e59566e240aa80b6f660d12693febf0fa96ee23bd610d" | ||
10 | |||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | ||
12 | export ARCHDIR = "generic" | ||
13 | |||
14 | do_configure_prepend () { | ||
15 | sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp | ||
16 | } | ||