Updated the DPDK recipe from v16.11 to v17.02.

for dpdk v17.02 updated the existing patch and recipe as per the changes in the directory names.

Rename and modified the patch:
dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch
accordingly since this doesn't apply cleanly on top of dpdk v17.02

Modified .inc according to the change in directory names.

Signed-off-by: Shashwat Pandey <shashwatx.pandey@intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>

3 files changed, 30 insertions, 26 deletions

diff --git a/common/recipes-extended/dpdk/dpdk.inc b/common/recipes-extended/dpdk/dpdk.inc
index 496dd97e..77bd4a8b 100644
--- a/common/recipes-extended/dpdk/dpdk.inc
+++ b/common/recipes-extended/dpdk/dpdk.inc
@@ -8,12 +8,12 @@ SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
            file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
            file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \
            file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
-           file://dpdk-16.11-dpdk-fix-installation-warning-and-issue.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 \
           "
 
-COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64"
+COMPATIBLE_MACHINE = "intel-corei7-64"
 
 # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
 # fuse is in meta-filesystems and qat is not yet upstreamed.
@@ -29,8 +29,8 @@ export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qa
 export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
 export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
 
-RDEPENDS_${PN} += "python-subprocess"
-DEPENDS = "virtual/kernel"
+RDEPENDS_${PN} += "python-subprocess dpdk-dev-libibverbs"
+DEPENDS = "virtual/kernel dpdk-dev-libibverbs"
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 inherit module
@@ -134,12 +134,12 @@ FILES_${PN}-dev += " \
         ${includedir} \
         ${includedir}/${ARCHDIR} \
         ${includedir}/exec-env \
-        ${INSTALL_PATH}/scripts/ \
+        ${INSTALL_PATH}/buildtools/ \
         ${INSTALL_PATH}/${RTE_TARGET}/include \
         ${INSTALL_PATH}/${RTE_TARGET}/lib \
         "
 
-FILES_${PN} += " ${INSTALL_PATH}/tools/ \
+FILES_${PN} += " ${INSTALL_PATH}/usertools/ \
                  ${prefix}/sbin/ \
                  ${prefix}/bin/ \
                  ${libdir}/ \
diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch b/common/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch
index f1f625d8..f5171674 100644
--- a/common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch
+++ b/common/recipes-extended/dpdk/dpdk/dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch
@@ -1,6 +1,6 @@
-From 1dcd79d49b3ad987d6313a857a74fc9efbcd2667 Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Mon, 14 Nov 2016 10:35:51 +0800
+From 363817bf84286fc167e0c3c255a7fd522bf87d8c Mon Sep 17 00:00:00 2001
+From: Shashwat Pandey <shashwatx.p@intel.com>
+Date: Mon, 20 Feb 2017 15:46:22 +0800
 Subject: [PATCH] dpdk: fix installation warning and issue
 
 Upstream-Status: Inappropriate [configuration]
@@ -11,16 +11,16 @@ For cross compiling cp -r and extra tar flags used to avoid  QA warning
 Added excluded files from bin and removing mk and app/dpdk-pmdinfogen files
 installation since it is not needed as a part of image.
 
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
+Signed-off-by: Shashwat Pandey <shashwatx.p@intel.com>
 ---
- mk/rte.sdkinstall.mk | 25 ++++++++++---------------
- 1 file changed, 10 insertions(+), 15 deletions(-)
+ mk/rte.sdkinstall.mk | 29 ++++++++++++++---------------
+ 1 file changed, 14 insertions(+), 15 deletions(-)
 
 diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
-index 7b0d8b5..d27125c 100644
+index dbac2a2..563954e 100644
 --- a/mk/rte.sdkinstall.mk
 +++ b/mk/rte.sdkinstall.mk
-@@ -115,16 +115,13 @@ endif
+@@ -115,16 +115,17 @@ endif
  
  install-runtime:
         $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
@@ -37,12 +37,16 @@ index 7b0d8b5..d27125c 100644
 +       tar -xf -      -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \
 +               --strip-components=1 --keep-newer-files --warning=no-ignore-newer
         $(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))
--       $(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir)
-+       $(Q)cp -r $(RTE_SDK)/tools $(DESTDIR)$(datadir)
-        $(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \
-                                   $(DESTDIR)$(datadir)/tools/setup.sh)
-        $(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \
-@@ -146,7 +143,7 @@ endif
+-       $(Q)cp -a $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
++       $(Q)cp -r $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
++       $(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-setup.sh, \
++                                  $(DESTDIR)$(datadir)/usertools/setup.sh)
++       $(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
++                                  $(DESTDIR)$(datadir)/usertools/dpdk_nic_bind.py)
+        $(Q)$(call rte_mkdir,      $(DESTDIR)$(sbindir))
+        $(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
+                                   $(DESTDIR)$(sbindir)/dpdk-devbind)
+@@ -142,7 +143,7 @@ endif
  install-kmod:
  ifneq ($(wildcard $O/kmod/*),)
         $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir))
@@ -51,22 +55,22 @@ index 7b0d8b5..d27125c 100644
  endif
  
  install-sdk:
-@@ -155,11 +152,9 @@ install-sdk:
+@@ -151,11 +152,9 @@ install-sdk:
             tar -xf -      -C $(DESTDIR)$(includedir) --strip-components=1 \
                 --keep-newer-files
         $(Q)$(call rte_mkdir,                            $(DESTDIR)$(sdkdir))
 -       $(Q)cp -a               $(RTE_SDK)/mk            $(DESTDIR)$(sdkdir)
--       $(Q)cp -a               $(RTE_SDK)/scripts       $(DESTDIR)$(sdkdir)
+-       $(Q)cp -a               $(RTE_SDK)/buildtools    $(DESTDIR)$(sdkdir)
 -       $(Q)$(call rte_mkdir,                            $(DESTDIR)$(targetdir)/app)
 -       $(Q)cp -a               $O/.config               $(DESTDIR)$(targetdir)
 -       $(Q)cp -a               $O/app/dpdk-pmdinfogen   $(DESTDIR)$(targetdir)/app
-+       $(Q)cp -r               $(RTE_SDK)/scripts       $(DESTDIR)$(sdkdir)
++       $(Q)cp -r               $(RTE_SDK)/buildtools       $(DESTDIR)$(sdkdir)
 +       $(Q)$(call rte_mkdir,                            $(DESTDIR)$(targetdir))
 +       $(Q)cp -r               $O/.config               $(DESTDIR)$(targetdir)
         $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include)
         $(Q)$(call rte_symlink, $(DESTDIR)$(libdir),     $(DESTDIR)$(targetdir)/lib)
  
-@@ -175,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),)
+@@ -171,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),)
         $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
  endif
         $(Q)$(call rte_mkdir,         $(DESTDIR)$(datadir))
diff --git a/common/recipes-extended/dpdk/dpdk_16.11.bb b/common/recipes-extended/dpdk/dpdk_17.02.bb
index 5617f10a..05b4b1cb 100644
--- a/common/recipes-extended/dpdk/dpdk_16.11.bb
+++ b/common/recipes-extended/dpdk/dpdk_17.02.bb
@@ -5,8 +5,8 @@ SRC_URI += "\
             file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
             "
 
-SRC_URI[dpdk.md5sum] = "f51ffc862a4f57b0030ca5d7ff07fef0"
-SRC_URI[dpdk.sha256sum] = "8098b3542b4c78d28bde5f4eba57d4ee929fffaaa941b7afd2b881eae0b45c00"
+SRC_URI[dpdk.md5sum] = "9ac25cffecbf550e145c45e53db03a3d"
+SRC_URI[dpdk.sha256sum] = "b07b546e910095174bdb6152bb0d7ce057cc4b79aaa74771aeee4e8a7219fb38"
 
 export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
 export ARCHDIR = "generic"