diff options
author | Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2016-01-12 19:06:09 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2016-01-12 11:07:00 -0800 |
commit | 5f07e8eb8293c39065baf3029acb9dcee17ef46e (patch) | |
tree | 1a2e6723c8eace19656aaac8d85ecab4eb1b3a44 /meta-isg/common | |
parent | e3f965cda3e2ee84c08b9cca10a24d0d03f54a4e (diff) | |
download | meta-intel-5f07e8eb8293c39065baf3029acb9dcee17ef46e.tar.gz |
meta-isg: dpdk: Upgrade DPDK v2.1.0 to DPDK v2.2.0
This will upgrade the recipe dpdk v2.1.0 to dpdk v2.2.0.
The recipe is for platforms like grantley and crystalforest
using the common BSP intel-corei7-64.
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-isg/common')
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk.inc | 2 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch (renamed from meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch) | 18 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb (renamed from meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb) | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index e08594c9..a4d7d152 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD & LGPLv2 & GPLv2" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe" |
5 | 5 | ||
6 | SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ | 6 | SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ |
7 | file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ | 7 | file://dpdk-2.2.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ |
8 | file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \ | 8 | file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \ |
9 | file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch \ | 9 | file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch \ |
10 | " | 10 | " |
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.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 index bfef2218..e446ce44 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 69238a0b910bca43ef13154718a7a6c9b0dabe8a Mon Sep 17 00:00:00 2001 | 1 | From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001 |
2 | From: Ong Boon Leong <boon.leong.ong@intel.com> | 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
3 | Date: Thu, 25 Jun 2015 15:39:38 +0800 | 3 | Date: Fri, 18 Dec 2015 18:30:47 +0800 |
4 | Subject: [PATCH] dpdk v1.8.0: add RTE_KERNELDIR_OUT to split kernel build | 4 | Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build |
5 | artifact | 5 | artifact |
6 | 6 | ||
7 | Introduce RTE_KERNELDIR_OUT to be the path to which kernel build | 7 | Introduce RTE_KERNELDIR_OUT to be the path to which kernel build |
@@ -11,13 +11,13 @@ separate directories for kernel source and kernel artifacts. | |||
11 | 11 | ||
12 | Upstream-Status: Inappropriate [configuration] | 12 | Upstream-Status: Inappropriate [configuration] |
13 | 13 | ||
14 | Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> | 14 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
15 | --- | 15 | --- |
16 | mk/rte.module.mk | 6 +++--- | 16 | mk/rte.module.mk | 6 +++--- |
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | 17 | 1 file changed, 3 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/mk/rte.module.mk b/mk/rte.module.mk | 19 | diff --git a/mk/rte.module.mk b/mk/rte.module.mk |
20 | index 7bf77c1..d4253a5 100644 | 20 | index 53ed4fe..b7a014b 100644 |
21 | --- a/mk/rte.module.mk | 21 | --- a/mk/rte.module.mk |
22 | +++ b/mk/rte.module.mk | 22 | +++ b/mk/rte.module.mk |
23 | @@ -77,7 +77,7 @@ build: _postbuild | 23 | @@ -77,7 +77,7 @@ build: _postbuild |
@@ -26,7 +26,7 @@ index 7bf77c1..d4253a5 100644 | |||
26 | @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi | 26 | @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi |
27 | - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ | 27 | - @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \ |
28 | + @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ | 28 | + @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \ |
29 | CC=$(KERNELCC) CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) | 29 | CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0) |
30 | 30 | ||
31 | # install module in $(RTE_OUTPUT)/kmod | 31 | # install module in $(RTE_OUTPUT)/kmod |
32 | @@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko | 32 | @@ -88,7 +88,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko |
@@ -48,5 +48,5 @@ index 7bf77c1..d4253a5 100644 | |||
48 | if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) | 48 | if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;) |
49 | @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi | 49 | @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi |
50 | -- | 50 | -- |
51 | 1.7.9.5 | 51 | 1.9.1 |
52 | 52 | ||
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb index 7a7af6fe..b9bd7f03 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb +++ b/meta-isg/common/recipes-extended/dpdk/dpdk_2.2.0.bb | |||
@@ -5,8 +5,8 @@ SRC_URI += "\ | |||
5 | file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ | 5 | file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRC_URI[dpdk.md5sum] = "205a0d12bfd6eb717d57506272f43519" | 8 | SRC_URI[dpdk.md5sum] = "22e2fd68cd5504f43fe9a5a6fd6dd938" |
9 | SRC_URI[dpdk.sha256sum] = "f7b322867a45f99afd9c8fbacdc56e1621676f9ca0f046656ec85eb6a99a3440" | 9 | SRC_URI[dpdk.sha256sum] = "77206ad93618ec93ef6e59566e240aa80b6f660d12693febf0fa96ee23bd610d" |
10 | 10 | ||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | 11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" |
12 | export ARCHDIR = "generic" | 12 | export ARCHDIR = "generic" |