From c5650b6811f58c27d7d4493864b3ca859cf66cbd Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Thu, 14 Apr 2016 22:18:19 +0800 Subject: [PATCH] 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 Signed-off-by: Saul Wold --- .../common/recipes-extended/dpdk/dpdk.inc | 6 ++-- ...TE_KERNELDIR_OUT-to-split-kernel-bu.patch} | 0 ...variable-to-enable-disable-dpdk_qat.patch} | 0 ...-sysroot-option-within-app-makefile.patch} | 0 ..._fragmentation-in-common_base-config.patch | 33 +++++++++++++++++++ ...t-to-the-right-include-and-lib-path.patch} | 0 ...-ip_fragmentation-in-common_linuxapp.patch | 31 ----------------- .../recipes-extended/dpdk/dpdk_16.04.bb | 16 +++++++++ .../recipes-extended/dpdk/dpdk_2.2.0.bb | 16 --------- 9 files changed, 52 insertions(+), 50 deletions(-) rename meta-isg/common/recipes-extended/dpdk/dpdk/{dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch => dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch} (100%) rename meta-isg/common/recipes-extended/dpdk/dpdk/{dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch => dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch} (100%) rename meta-isg/common/recipes-extended/dpdk/dpdk/{dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch => dpdk-16.04-add-sysroot-option-within-app-makefile.patch} (100%) create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch rename meta-isg/common/recipes-extended/dpdk/dpdk/{dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch => dpdk-16.04-point-to-the-right-include-and-lib-path.patch} (100%) delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk_16.04.bb delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb 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" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ - file://dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ - file://dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch \ - file://dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch \ + file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ + file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ + file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ " 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 similarity index 100% rename from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch rename to 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 similarity index 100% rename from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch rename to 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 similarity index 100% rename from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch rename to 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 @@ +From f7be643cc62860a986c9e0aec990c90bfc58a941 Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Fri, 1 Apr 2016 17:31:55 +0800 +Subject: [PATCH] dpdk: enable ip_fragmentation in common_base config + +Upstream-Status: Inappropriate [Configuration] + +This configuration need to set for ip_fragmentation application. + +Signed-off-by: Rahul Kumar Gupta +--- + config/common_base | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/config/common_base b/config/common_base +index abd6a64..90259f0 100644 +--- a/config/common_base ++++ b/config/common_base +@@ -442,6 +442,11 @@ CONFIG_RTE_LIBRTE_POWER_DEBUG=n + CONFIG_RTE_MAX_LCORE_FREQS=64 + + # ++# Compile ip_fragmentation ++# ++CONFIG_RTE_IP_FRAG=y ++ ++# + # Compile librte_net + # + CONFIG_RTE_LIBRTE_NET=y +-- +1.9.1 + 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 similarity index 100% rename from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch rename to 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 @@ -From ebf07e9708c96aa1e655127175c39ad6ae3fc5ae Mon Sep 17 00:00:00 2001 -From: WU CHIA CHUAN -Date: Tue, 28 Jul 2015 13:12:21 +0800 -Subject: [PATCH] dpdk enable ip_fragmentation in common_linuxapp config - -Upstream-Status: Inappropriate [Configuration] - -Signed-off-by: WU CHIA CHUAN ---- - config/common_linuxapp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/config/common_linuxapp b/config/common_linuxapp -index 0b25f34..8cd97d7 100644 ---- a/config/common_linuxapp -+++ b/config/common_linuxapp -@@ -354,6 +354,11 @@ CONFIG_RTE_MAX_LCORE_FREQS=64 - CONFIG_RTE_LIBRTE_NET=y - - # -+# Compile ip_fragmentation -+# -+CONFIG_RTE_IP_FRAG=y -+ -+# - # Compile librte_ip_frag - # - CONFIG_RTE_LIBRTE_IP_FRAG=y --- -1.9.1 - 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 @@ +include dpdk.inc + +SRC_URI += "\ + file://dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch \ + file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ + " + +SRC_URI[dpdk.md5sum] = "0728d506d7f56eb64233e824fa3c098a" +SRC_URI[dpdk.sha256sum] = "d631495bc6e8d4c4aec72999ac03c3ce213bb996cb88f3bf14bb980dad1d3f7b" + +export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" +export ARCHDIR = "generic" + +do_configure_prepend () { + sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp +} 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 @@ -include dpdk.inc - -SRC_URI += "\ - file://dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch \ - file://dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ - " - -SRC_URI[dpdk.md5sum] = "22e2fd68cd5504f43fe9a5a6fd6dd938" -SRC_URI[dpdk.sha256sum] = "77206ad93618ec93ef6e59566e240aa80b6f660d12693febf0fa96ee23bd610d" - -export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" -export ARCHDIR = "generic" - -do_configure_prepend () { - sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp -}