From 1550b638fca662c5e68556702ff0316c3fc9562c Mon Sep 17 00:00:00 2001 From: Radek Zetik Date: Thu, 1 Oct 2015 18:13:18 +0100 Subject: 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 Reviewed-by: Maryam Tahhan Reviewed-by: Brian Castelli --- src/ovs/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/ovs/Makefile') 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) -- cgit 1.2.3-korg