diff options
| -rw-r--r-- | docs/release/userguide/installguide.oneclick.rst | 15 | ||||
| -rw-r--r-- | src/dpdk/Makefile | 10 | ||||
| -rw-r--r-- | src/package-list.mk | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst index 61d561a6..76a81db9 100644 --- a/docs/release/userguide/installguide.oneclick.rst +++ b/docs/release/userguide/installguide.oneclick.rst @@ -290,11 +290,16 @@ 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 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'. + From Jerma release, the supported dpdk version is 19.11 + + If you would like to use v18.11, Do the following changes: + 1.Update the dpdk version to v18.11 in <barometer>/src/package-list.mk + 2.Replace all 'common_linux' string with 'common_linuxapp' in <barometer>/src/dpdk/Makefile + + If you would like to downgrade to a version lower than v18.11, Do the following changes: + 1.Update the dpdk version to a version lower than v18.11(Eg:- v16.11) in <barometer>/src/package-list.mk + 2.Replace all 'common_linux' string with 'common_linuxapp' in <barometer>/src/dpdk/Makefile + 3.Change the Makefile path from '(WORKDIR)/kernel/linux/kni/Makefile' to (WORKDIR)/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 dec8cae5..f7efa3d1 100644 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -34,14 +34,14 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done # VHOST configuration options are stored in different files based on DPDK version # v1.2.3r0-v1.6.0r2 - configuration inside config/defconfig_x86_64-default-linuxapp-gcc -# v1.7.0-rc1-v2.2.0 - configuration inside config/common_linuxapp -# v16 and newer - configuration split between config/common_linuxapp and config/common_base +# v1.7.0-rc1-v2.2.0 - configuration inside config/common_linux +# v16 and newer - configuration split between config/common_linux and config/common_base DPDK_TAG_MAJOR = $(shell echo $(DPDK_TAG) | cut -d. -f1) DPDK_TAG_MINOR = $(shell echo $(DPDK_TAG) | cut -d. -f2) ifeq ($(DPDK_TAG_MAJOR),v1) ifeq ($(DPDK_TAG_MINOR), $(filter $(DPDK_TAG_MINOR), 7 8)) DPDK_TARGET = x86_64-native-linuxapp-gcc - CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linux else DPDK_TARGET = x86_64-default-linuxapp-gcc CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/defconfig_x86_64-default-linuxapp-gcc @@ -49,11 +49,11 @@ endif else ifeq ($(DPDK_TAG_MAJOR),v2) DPDK_TARGET = x86_64-native-linuxapp-gcc - CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linux else DPDK_TARGET = x86_64-native-linuxapp-gcc CONFIG_FILE_BASE = $(WORK_DIR)/config/common_base - CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linux endif endif diff --git a/src/package-list.mk b/src/package-list.mk index dce32cfb..27ca3de3 100644 --- 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 ?= v18.11 +DPDK_TAG ?= v19.11 LIBPQOS_URL ?= https://github.com/01org/intel-cmt-cat.git LIBPQOS_TAG ?= master |