From c5650b6811f58c27d7d4493864b3ca859cf66cbd Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Thu, 14 Apr 2016 22:18:19 +0800 Subject: 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 --- meta-isg/common/recipes-extended/dpdk/dpdk.inc | 6 +-- ...-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | 52 ++++++++++++++++++++++ ...onfig-variable-to-enable-disable-dpdk_qat.patch | 31 +++++++++++++ ...04-add-sysroot-option-within-app-makefile.patch | 33 ++++++++++++++ ...le-ip_fragmentation-in-common_base-config.patch | 33 ++++++++++++++ ...4-point-to-the-right-include-and-lib-path.patch | 43 ++++++++++++++++++ ...-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | 52 ---------------------- ...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_16.04.bb | 16 +++++++ .../common/recipes-extended/dpdk/dpdk_2.2.0.bb | 16 ------- 13 files changed, 211 insertions(+), 209 deletions(-) create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable-dpdk_qat.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-sysroot-option-within-app-makefile.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib-path.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-config-variable-to-enable-disable-dpdk_qat.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch delete mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-point-to-the-right-include-and-lib-path.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-16.04-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 new file mode 100644 index 00000000..e446ce44 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch @@ -0,0 +1,52 @@ +From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Fri, 18 Dec 2015 18:30:47 +0800 +Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build + artifact + +Introduce RTE_KERNELDIR_OUT to be the path to which kernel build +artifacts are located. This is for matching the workflow change +since Yocto Project v1.8 onwards whereby tmp/work-shared contains +separate directories for kernel source and kernel artifacts. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Rahul Kumar Gupta +--- + mk/rte.module.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mk/rte.module.mk b/mk/rte.module.mk +index 53ed4fe..b7a014b 100644 +--- a/mk/rte.module.mk ++++ b/mk/rte.module.mk +@@ -77,7 +77,7 @@ build: _postbuild + # build module + $(MODULE).ko: $(SRCS_LINKS) + @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi +- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ ++ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ + CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) + + # install module in $(RTE_OUTPUT)/kmod +@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko + + # install module + modules_install: +- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ ++ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ + modules_install + + .PHONY: clean +@@ -98,7 +98,7 @@ clean: _postclean + .PHONY: doclean + doclean: + @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi +- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean ++ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean + @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ + if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) + @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi +-- +1.9.1 + diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-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 new file mode 100644 index 00000000..cd517052 --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-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-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 new file mode 100644 index 00000000..db762e9e --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-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-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-16.04-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 new file mode 100644 index 00000000..75bb517d --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-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/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch deleted file mode 100644 index e446ce44..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001 -From: Rahul Kumar Gupta -Date: Fri, 18 Dec 2015 18:30:47 +0800 -Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build - artifact - -Introduce RTE_KERNELDIR_OUT to be the path to which kernel build -artifacts are located. This is for matching the workflow change -since Yocto Project v1.8 onwards whereby tmp/work-shared contains -separate directories for kernel source and kernel artifacts. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Rahul Kumar Gupta ---- - mk/rte.module.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mk/rte.module.mk b/mk/rte.module.mk -index 53ed4fe..b7a014b 100644 ---- a/mk/rte.module.mk -+++ b/mk/rte.module.mk -@@ -77,7 +77,7 @@ build: _postbuild - # build module - $(MODULE).ko: $(SRCS_LINKS) - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi -- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ -+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ - CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) - - # install module in $(RTE_OUTPUT)/kmod -@@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko - - # install module - modules_install: -- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ -+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ - modules_install - - .PHONY: clean -@@ -98,7 +98,7 @@ clean: _postclean - .PHONY: doclean - doclean: - @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi -- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean -+ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean - @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\ - if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) - @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi --- -1.9.1 - 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 deleted file mode 100644 index cd517052..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.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-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 deleted file mode 100644 index db762e9e..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-sysroot-option-within-app-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 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/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 deleted file mode 100644 index 75bb517d..00000000 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.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_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 -} -- cgit v1.2.3-54-g00ecf