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>

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"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
-           file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
+           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 \
           "
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 @@
-From 69238a0b910bca43ef13154718a7a6c9b0dabe8a Mon Sep 17 00:00:00 2001
-From: Ong Boon Leong <boon.leong.ong@intel.com>
-Date: Thu, 25 Jun 2015 15:39:38 +0800
-Subject: [PATCH] dpdk v1.8.0: add RTE_KERNELDIR_OUT to split kernel build
+From 6c8d348190a8cf6c35111913cbf117ca98137e84 Mon Sep 17 00:00:00 2001
+From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+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
@@ -11,13 +11,13 @@ separate directories for kernel source and kernel artifacts.
 
 Upstream-Status: Inappropriate [configuration]
 
-Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
+Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
 ---
- mk/rte.module.mk |    6 +++---
+ 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 7bf77c1..d4253a5 100644
+index 53ed4fe..b7a014b 100644
 --- a/mk/rte.module.mk
 +++ b/mk/rte.module.mk
 @@ -77,7 +77,7 @@ build: _postbuild
@@ -26,7 +26,7 @@ index 7bf77c1..d4253a5 100644
         @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)
+                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
@@ -48,5 +48,5 @@ index 7bf77c1..d4253a5 100644
                 if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
         @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
 -- 
-1.7.9.5
+1.9.1
 
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 += "\
             file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \
             "
 
-SRC_URI[dpdk.md5sum] = "205a0d12bfd6eb717d57506272f43519"
-SRC_URI[dpdk.sha256sum] = "f7b322867a45f99afd9c8fbacdc56e1621676f9ca0f046656ec85eb6a99a3440"
+SRC_URI[dpdk.md5sum] = "22e2fd68cd5504f43fe9a5a6fd6dd938"
+SRC_URI[dpdk.sha256sum] = "77206ad93618ec93ef6e59566e240aa80b6f660d12693febf0fa96ee23bd610d"
 
 export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
 export ARCHDIR = "generic"