summaryrefslogtreecommitdiffstats
path: root/src/ovs
diff options
context:
space:
mode:
authorRadek Zetik <radekx.zetik@intel.com>2015-10-01 18:13:18 +0100
committerMaryam Tahhan <maryam.tahhan@intel.com>2015-10-07 14:52:16 +0000
commit1550b638fca662c5e68556702ff0316c3fc9562c (patch)
treeb1127cc75b45fd64b216070ed78b57e52db2c30e /src/ovs
parent46e36fffc36753b0e8e3f79f78dc084f26930a82 (diff)
The 'make' creates all required variants of vSwitch
Currently the VSPERF makefiles make just one variant of vSwitch - OVS with DPDK-vhost-user. To make the other variants the makefile has to be edited. And the make re-run. The fix builds all required versions: DPDK-vhost-user OVS (in src/) Vanilla OVS (in src_vanilla/) DPDK-vhost-cuse OVS (in src_cuse/) HowTo: - git clone vsperf - cd .../src - make JIRA: VSPERF-85 Change-Id: I469baf8432f0b127cde785f35a6c57a2c778f23f Signed-off-by: Radek Zetik <radekx.zetik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'src/ovs')
-rwxr-xr-xsrc/ovs/Makefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ovs/Makefile b/src/ovs/Makefile
index 223d2dcb..32a7ab00 100755
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -26,6 +26,8 @@ WORK_DIR = ovs
TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done
CONFIG_CMD =
CONFIG_CMD += ./configure
+OVS_VANILLA = ../../src_vanilla/ovs
+OVS_CUSE = ../../src_cuse/ovs
# If WITH_LINUX is defined, OVS is built without DPDK but with kernel
# module
@@ -69,6 +71,7 @@ config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure
INSTALL_TARGET = force_install force_make
force_make: $(WORK_DIR)/Makefile
+ $(AT)echo "WITH_LINUX = $(WITH_LINUX)"
$(AT)$(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS)
@echo "Make done"
@@ -82,6 +85,8 @@ install: $(INSTALL_TARGET)
clean:
clobber:
$(AT)rm -rf $(WORK_DIR)
+ $(AT)rm -rf $(OVS_VANILLA)
+ $(AT)rm -rf $(OVS_CUSE)
# cleanse is for developer who would like to keep the
# clone git repo, saving time to fetch again from url
@@ -105,6 +110,10 @@ boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
$(WORK_DIR):
$(AT)git clone $(OVS_URL)
+ $(AT)mkdir -p $(OVS_VANILLA)
+ $(AT)cp -rf ./* $(OVS_VANILLA)
+ $(AT)mkdir -p $(OVS_CUSE)
+ $(AT)cp -rf ./* $(OVS_CUSE)
$(TAG_DONE_FLAG): $(WORK_DIR)
$(AT)cd ovs; git checkout $(OVS_TAG)