From 4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Tue, 12 Jan 2016 19:06:10 +0800 Subject: meta-isg: dpdk v2.2.0: rename the patches used This will rename the patches according to the dpdk version. modify the .inc and .bb according to modified name of patches. change the commit msg for patch: dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch since it have mentioned the version not in use. Signed-off-by: Rahul Kumar Gupta Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/dpdk/dpdk.inc | 4 +- ....0-add-sysroot-option-within-app-makefile.patch | 33 ----------------- ...0-point-to-the-right-include-and-lib-path.patch | 43 ---------------------- ...nable-ip_fragmentation-in-common_linuxapp.patch | 31 ---------------- ...onfig-variable-to-enable-disable-dpdk_qat.patch | 31 ---------------- ...onfig-variable-to-enable-disable-dpdk_qat.patch | 31 ++++++++++++++++ ....0-add-sysroot-option-within-app-makefile.patch | 33 +++++++++++++++++ ...nable-ip_fragmentation-in-common_linuxapp.patch | 31 ++++++++++++++++ ...0-point-to-the-right-include-and-lib-path.patch | 43 ++++++++++++++++++++++ .../common/recipes-extended/dpdk/dpdk_2.2.0.bb | 4 +- 10 files changed, 142 insertions(+), 142 deletions(-) delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch create 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/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index a4d7d152..6ae51d64 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc @@ -5,8 +5,8 @@ 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-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \ - file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.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 \ " COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch deleted file mode 100644 index 02c7dc3c..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3112250f6452215890fc7db73c8127e111af956f Mon Sep 17 00:00:00 2001 -From: Ong Boon Leong -Date: Thu, 2 Jul 2015 23:51:01 +0800 -Subject: [PATCH] dpdk v1.8.0: add --sysroot option within app makefile - -Upstream-Status: Inappropriate [configuration] - -in DPDK v1.8.0, rte.app.mk has been changed to add -Wl, to -all items listed under EXTRA_LDFLAGS. It causes --sysroot= - to not setup correctly when we depends on gcc to setup -for GNU ld. - -Signed-off-by: Ong Boon Leong ---- - mk/rte.app.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mk/rte.app.mk b/mk/rte.app.mk -index e1a0dbf..9528588 100644 ---- a/mk/rte.app.mk -+++ b/mk/rte.app.mk -@@ -259,7 +259,7 @@ ifeq ($(LINK_USING_CC),1) - override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) - O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \ - -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \ -- $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS)) -+ $(EXTRA_LDFLAGS) $(SYSROOTPATH) $(call linkerprefix,$(LDLIBS)) - else - O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ - -Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS) --- -1.7.9.5 - diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch deleted file mode 100644 index 75bb517d..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 928595c80ae28d19861d7e76ed898a8fb3f2c1dc Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 24 Jul 2015 23:57:17 +0800 -Subject: [PATCH] dpdk: point to the right include and lib path - -Upstream-Status: Inappropriate [Configuration] - -Make sure that we point to the right location of qat -lac headers and library. - -Signed-off-by: Anuj Mittal ---- - examples/dpdk_qat/Makefile | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile -index f1e06a1..5b906f7 100644 ---- a/examples/dpdk_qat/Makefile -+++ b/examples/dpdk_qat/Makefile -@@ -66,18 +66,15 @@ SRCS-y := main.c crypto.c - - CFLAGS += -O3 - CFLAGS += $(WERROR_FLAGS) --CFLAGS += -I$(ICP_ROOT)/quickassist/include \ -- -I$(ICP_ROOT)/quickassist/include/lac \ -- -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include -+CFLAGS += -I$(ICP_LAC_API_DIR) - - # From CRF 1.2 driver, library was renamed to libicp_qa_al.a - ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),) - ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a - else --ICP_LIBRARY_PATH = $(ICP_ROOT)/build/libicp_qa_al.a -+ICP_LIBRARY_PATH = $(ICP_LIB_ROOT)/libicp_qa_al.a - endif - --LDLIBS += -L$(ICP_ROOT)/build - LDLIBS += $(ICP_LIBRARY_PATH) \ - -lz \ - -losal \ --- -1.7.9.5 - diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.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.0.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/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch deleted file mode 100644 index cd517052..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a424a79b1422f1877de3ee7aee6f781aeacc3630 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 18 Aug 2015 12:36:02 +0800 -Subject: [PATCH] examples: add config variable to enable/disable dpdk_qat - -Upstream-Status: Inappropriate [configuration] - -Add CONFIG_EXAMPLE_DPDK_QAT to control compilation of dpdk_qat -example by PACKAGECONFIG - -Signed-off-by: Anuj Mittal ---- - examples/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/Makefile b/examples/Makefile -index b4eddbd..1bc14b0 100644 ---- a/examples/Makefile -+++ b/examples/Makefile -@@ -41,7 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond - DIRS-y += cmdline - DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor - ifneq ($(ICP_ROOT),) --DIRS-y += dpdk_qat -+DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat - endif - DIRS-y += exception_path - DIRS-y += helloworld --- -1.7.9.5 - 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-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch new file mode 100644 index 00000000..cd517052 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch @@ -0,0 +1,31 @@ +From a424a79b1422f1877de3ee7aee6f781aeacc3630 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Tue, 18 Aug 2015 12:36:02 +0800 +Subject: [PATCH] examples: add config variable to enable/disable dpdk_qat + +Upstream-Status: Inappropriate [configuration] + +Add CONFIG_EXAMPLE_DPDK_QAT to control compilation of dpdk_qat +example by PACKAGECONFIG + +Signed-off-by: Anuj Mittal +--- + examples/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile b/examples/Makefile +index b4eddbd..1bc14b0 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -41,7 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond + DIRS-y += cmdline + DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor + ifneq ($(ICP_ROOT),) +-DIRS-y += dpdk_qat ++DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat + endif + DIRS-y += exception_path + DIRS-y += helloworld +-- +1.7.9.5 + 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-2.2.0-add-sysroot-option-within-app-makefile.patch new file mode 100644 index 00000000..db762e9e --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch @@ -0,0 +1,33 @@ +From 893d208cc66fbe533ab4e3e66907c5f63266579b Mon Sep 17 00:00:00 2001 +From: Ong Boon Leong +Date: Thu, 2 Jul 2015 23:51:01 +0800 +Subject: [PATCH] dpdk: add --sysroot option within app makefile + +Upstream-Status: Inappropriate [configuration] + +rte.app.mk has been changed to add -Wl, to all items listed +under EXTRA_LDFLAGS. It causes --sysroot= to not setup +correctly when we depends on gcc to setup for GNU ld. + +Signed-off-by: Ong Boon Leong +Signed-off-by: Rahul Kumar Gupta +--- + mk/rte.app.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/rte.app.mk b/mk/rte.app.mk +index 8ecab41..35fcd8d 100644 +--- a/mk/rte.app.mk ++++ b/mk/rte.app.mk +@@ -186,7 +186,7 @@ ifeq ($(LINK_USING_CC),1) + override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) + O_TO_EXE = $(CC) $(CFLAGS) $(LDFLAGS_$(@)) \ + -Wl,-Map=$(@).map,--cref -o $@ $(OBJS-y) $(call linkerprefix,$(LDFLAGS)) \ +- $(EXTRA_LDFLAGS) $(call linkerprefix,$(LDLIBS)) ++ $(EXTRA_LDFLAGS) $(SYSROOTPATH) $(call linkerprefix,$(LDLIBS)) + else + O_TO_EXE = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \ + -Map=$(@).map --cref -o $@ $(OBJS-y) $(LDLIBS) +-- +1.9.1 + 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 new file mode 100644 index 00000000..c4c683e8 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch @@ -0,0 +1,31 @@ +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/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch new file mode 100644 index 00000000..75bb517d --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-point-to-the-right-include-and-lib-path.patch @@ -0,0 +1,43 @@ +From 928595c80ae28d19861d7e76ed898a8fb3f2c1dc Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Fri, 24 Jul 2015 23:57:17 +0800 +Subject: [PATCH] dpdk: point to the right include and lib path + +Upstream-Status: Inappropriate [Configuration] + +Make sure that we point to the right location of qat +lac headers and library. + +Signed-off-by: Anuj Mittal +--- + examples/dpdk_qat/Makefile | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile +index f1e06a1..5b906f7 100644 +--- a/examples/dpdk_qat/Makefile ++++ b/examples/dpdk_qat/Makefile +@@ -66,18 +66,15 @@ SRCS-y := main.c crypto.c + + CFLAGS += -O3 + CFLAGS += $(WERROR_FLAGS) +-CFLAGS += -I$(ICP_ROOT)/quickassist/include \ +- -I$(ICP_ROOT)/quickassist/include/lac \ +- -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include ++CFLAGS += -I$(ICP_LAC_API_DIR) + + # From CRF 1.2 driver, library was renamed to libicp_qa_al.a + ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),) + ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a + else +-ICP_LIBRARY_PATH = $(ICP_ROOT)/build/libicp_qa_al.a ++ICP_LIBRARY_PATH = $(ICP_LIB_ROOT)/libicp_qa_al.a + endif + +-LDLIBS += -L$(ICP_ROOT)/build + LDLIBS += $(ICP_LIBRARY_PATH) \ + -lz \ + -losal \ +-- +1.7.9.5 + 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 index b9bd7f03..ffb82679 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb @@ -1,8 +1,8 @@ include dpdk.inc SRC_URI += "\ - file://dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch \ - file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ + 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" -- cgit v1.2.3-54-g00ecf