Merge "Moving DPDK Verion From 16.11 to 18.11. Updated the related section in usergui...

diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst
index 7b214de..61d561a 100644 (file)
--- a/docs/release/userguide/installguide.oneclick.rst
+++ b/docs/release/userguide/installguide.oneclick.rst
@@ -290,7 +290,11 @@ To make some changes when a container is running run:
 List of default plugins for collectd container
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. note::
-   The dpdk plugins dpdkevents and dpdkstat were tested with DPDK v16.11.
+   The dpdk plugins dpdkevents and dpdkstat were tested with DPDK v18.11.
+   From Iruya release onwards, Barometer will support only DPDK v18.11 and above.
+   If you would like to use lower versions, you would need to change the Makefile path from
+   '(WORK_DIR)/kernel/linux/kni/Makefile' to (WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile
+   in '(WORK_DIR)/src/dpdk/Makefile'.
 
 By default the collectd is started with default configuration which includes
 the followin plugins:

diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile
index fc6a15d..dec8cae 100644 (file)
--- a/src/dpdk/Makefile
+++ b/src/dpdk/Makefile
@@ -86,13 +86,13 @@ endif
 # CentOS 7.3 specific config changes to compile
 ifeq ($(ID),"centos")
 ifeq ($(VERSION_ID),"7")
-       $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile
+       $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/kernel/linux/kni/Makefile
 endif
 endif
 # RHEL 7.3 specific config changes to compile
 ifeq ($(ID),"rhel")
 ifeq ($(VERSION_ID),"7.3")
-       $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile
+       $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/kernel/linux/kni/Makefile
 endif
 endif
        $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE_LINUXAPP)

diff --git a/src/package-list.mk b/src/package-list.mk
index a5c7bcf..34e404c 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -6,7 +6,7 @@
 # dpdk section
 # DPDK_URL ?= git://dpdk.org/dpdk
 DPDK_URL ?= http://dpdk.org/git/dpdk
-DPDK_TAG ?= v16.11
+DPDK_TAG ?= v18.11
 
 LIBPQOS_URL ?= https://github.com/01org/intel-cmt-cat.git
 LIBPQOS_TAG ?= master