diff options
| author |   goldammx <martinx.goldammer@intel.com> | 2017-01-19 04:56:48 -0500 |
|---|---|---|
| committer | goldammx <martinx.goldammer@intel.com> | 2017-01-20 07:19:21 -0500 |
| commit | f3205933d1ef9da4151c58c13d28ba1f26bb12a0 (patch) | |
| tree | e38e00b6ecbe7f53f388466644ee3fe4c0ece00d | |
| parent | ecadcfd29d4228f73d3ec3456d377162b165068a (diff) | |
centos73_install: Provide installer script for CentOS 7.3
Adds installer script for CentOS 7.3. Modifications are
based on installation script for RHEL7.3.
Modified dpdk makefile to allow upstream dpdk to build.
Prevents upstream vanilla OVS from building due to kernel
incompatibilities.
JIRA: VSPERF-452
Change-Id: Iaf05de0cf2ad7f5636d9474f351d3c7d193123cf
Signed-off-by: Martin Goldammer <martinx.goldammer@intel.com>
Reviewed-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Bill Michalowski <bmichalo@redhat.com>
Reviewed-by: Antonio Fischetti <antonio.fischetti@intel.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
| -rwxr-xr-x | docs/configguide/installation.rst | 10 | ||||
| -rwxr-xr-x | src/dpdk/Makefile | 6 | ||||
| -rwxr-xr-x | systems/centos/build_base_machine.sh | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst index 5010aefd..476919af 100755 --- a/docs/configguide/installation.rst +++ b/docs/configguide/installation.rst @@ -9,7 +9,7 @@ Installing vswitchperf Supported Operating Systems --------------------------- -* CentOS 7 +* CentOS 7.3 * Fedora 20 * Fedora 21 * Fedora 22 @@ -98,10 +98,10 @@ will also use `virtualenv`_ to create a vsperf virtual environment, which is isolated from the default Python environment. This environment will reside in a directory called **vsperfenv** in $HOME. -**Please Note**: For RHEL 7.3 Enterprise OVS Vanilla is not built from upstream -source due to kernel incompatibilities. Please see the instructions in the -vswitchperf_design document for details on configuring OVS Vanilla for binary -package usage. +**Please Note**: For RHEL 7.3 Enterprise and CentOS 7.3 OVS Vanilla is not +built from upstream source due to kernel incompatibilities. Please see the +instructions in the vswitchperf_design document for details on configuring +OVS Vanilla for binary package usage. You will need to activate the virtual environment every time you start a new shell session. Its activation is specific to your OS: diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 93cb7292..69671169 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -79,6 +79,12 @@ else $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE_LINUXAPP) $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE_LINUXAPP) 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 +endif +endif # RHEL 7.3 specific config changes to compile ifeq ($(ID),"rhel") ifeq ($(VERSION_ID),"7.3") diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh index 5430ceba..f2efb541 100755 --- a/systems/centos/build_base_machine.sh +++ b/systems/centos/build_base_machine.sh @@ -77,3 +77,5 @@ python33 python33-python-tkinter git-review " | grep -v ^#) +# prevent ovs vanilla from building from source due to kernel incompatibilities +sed -i s/'SUBBUILDS = src_vanilla'/'#SUBBUILDS = src_vanilla'/ ../src/Makefile |