aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-extended/dpdk/dpdk.inc5
-rw-r--r--recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch30
-rw-r--r--recipes-extended/dpdk/dpdk_18.02.bb (renamed from recipes-extended/dpdk/dpdk_17.05.bb)4
3 files changed, 5 insertions, 34 deletions
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 37d66b12..ce4e8bc0 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -1,13 +1,14 @@
DESCRIPTION = "Intel(r) Data Plane Development Kit"
HOMEPAGE = "http://dpdk.org"
LICENSE = "BSD & LGPLv2 & GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
+ file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
- file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \
file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
"
diff --git a/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch b/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch
deleted file mode 100644
index 4254d073..00000000
--- a/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8ce0e3249942a90f733bb2113e70e5a90ae67b00 Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Thu, 21 Jul 2016 05:53:52 +0800
-Subject: [PATCH 1/2] dpdk: fix compilation with dynamic libs
-
-Upstream-Status: Inappropriate [Configuration]
-
-Ensure that the correct cflags are being used.
-
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
----
- mk/rte.lib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk
-index 8f7e021..42610c9 100644
---- a/mk/rte.lib.mk
-+++ b/mk/rte.lib.mk
-@@ -70,7 +70,7 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
- ifeq ($(LINK_USING_CC),1)
- # Override the definition of LD here, since we're linking with CC
--LD := $(CC) $(CPU_CFLAGS)
-+LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS)
- _CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS))
- override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
- else
---
-1.9.1
-
diff --git a/recipes-extended/dpdk/dpdk_17.05.bb b/recipes-extended/dpdk/dpdk_18.02.bb
index 1a696ede..537d615c 100644
--- a/recipes-extended/dpdk/dpdk_17.05.bb
+++ b/recipes-extended/dpdk/dpdk_18.02.bb
@@ -5,8 +5,8 @@ SRC_URI += "\
file://0001-examples-Fix-maybe-uninitialized-warning.patch \
"
-SRC_URI[dpdk.md5sum] = "39c4e1110dd1ef9dab33edbae820f939"
-SRC_URI[dpdk.sha256sum] = "763bfb7e1765efcc949e79d645dc9f1ebd16591431ba0db5ce22becd928dcd0a"
+SRC_URI[dpdk.md5sum] = "49d08ced0a978a71cc3942af5cf51b95"
+SRC_URI[dpdk.sha256sum] = "f1210310fd5f01a3babe3a09d9b3e5a9db791c2ec6ecfbf94ade9f893a0632b8"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"