diff options
author | Awais Belal <awais_belal@mentor.com> | 2018-03-28 12:27:47 +0500 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2018-03-30 11:11:38 -0700 |
commit | 6863a1c00269394390b526ca4806204a969be970 (patch) | |
tree | 8a82502539cddc272bf59af46dc3dba459c70a2b | |
parent | e20c4f5977132f11c116af79ef649197ac28d9f5 (diff) | |
download | meta-dpdk-6863a1c00269394390b526ca4806204a969be970.tar.gz |
dpdk: upgrade to 18.02
This upgrades the dpdk package to 18.02 which is
the latest release and drops a patch that has
already been merged upstream in this package.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r-- | recipes-extended/dpdk/dpdk.inc | 5 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch | 30 | ||||
-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 37d66b1..ce4e8bc 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc | |||
@@ -1,13 +1,14 @@ | |||
1 | DESCRIPTION = "Intel(r) Data Plane Development Kit" | 1 | DESCRIPTION = "Intel(r) Data Plane Development Kit" |
2 | HOMEPAGE = "http://dpdk.org" | 2 | HOMEPAGE = "http://dpdk.org" |
3 | LICENSE = "BSD & LGPLv2 & GPLv2" | 3 | LICENSE = "BSD & LGPLv2 & GPLv2" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
5 | file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ | ||
6 | file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" | ||
5 | 7 | ||
6 | SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ | 8 | SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ |
7 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ | 9 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ |
8 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ | 10 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ |
9 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ | 11 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ |
10 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ | ||
11 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ | 12 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ |
12 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ | 13 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ |
13 | " | 14 | " |
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 4254d07..0000000 --- a/recipes-extended/dpdk/dpdk/dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 8ce0e3249942a90f733bb2113e70e5a90ae67b00 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
3 | Date: Thu, 21 Jul 2016 05:53:52 +0800 | ||
4 | Subject: [PATCH 1/2] dpdk: fix compilation with dynamic libs | ||
5 | |||
6 | Upstream-Status: Inappropriate [Configuration] | ||
7 | |||
8 | Ensure that the correct cflags are being used. | ||
9 | |||
10 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
11 | --- | ||
12 | mk/rte.lib.mk | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk | ||
16 | index 8f7e021..42610c9 100644 | ||
17 | --- a/mk/rte.lib.mk | ||
18 | +++ b/mk/rte.lib.mk | ||
19 | @@ -70,7 +70,7 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) | ||
20 | |||
21 | ifeq ($(LINK_USING_CC),1) | ||
22 | # Override the definition of LD here, since we're linking with CC | ||
23 | -LD := $(CC) $(CPU_CFLAGS) | ||
24 | +LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS) | ||
25 | _CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) | ||
26 | override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) | ||
27 | else | ||
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
diff --git a/recipes-extended/dpdk/dpdk_17.05.bb b/recipes-extended/dpdk/dpdk_18.02.bb index 1a696ed..537d615 100644 --- a/recipes-extended/dpdk/dpdk_17.05.bb +++ b/recipes-extended/dpdk/dpdk_18.02.bb | |||
@@ -5,8 +5,8 @@ SRC_URI += "\ | |||
5 | file://0001-examples-Fix-maybe-uninitialized-warning.patch \ | 5 | file://0001-examples-Fix-maybe-uninitialized-warning.patch \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRC_URI[dpdk.md5sum] = "39c4e1110dd1ef9dab33edbae820f939" | 8 | SRC_URI[dpdk.md5sum] = "49d08ced0a978a71cc3942af5cf51b95" |
9 | SRC_URI[dpdk.sha256sum] = "763bfb7e1765efcc949e79d645dc9f1ebd16591431ba0db5ce22becd928dcd0a" | 9 | SRC_URI[dpdk.sha256sum] = "f1210310fd5f01a3babe3a09d9b3e5a9db791c2ec6ecfbf94ade9f893a0632b8" |
10 | 10 | ||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | 11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" |
12 | export ARCHDIR = "generic" | 12 | export ARCHDIR = "generic" |