diff options
| author |   Radek Zetik <radekx.zetik@intel.com> | 2015-10-01 18:13:18 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2015-10-07 14:52:16 +0000 |
| commit | 1550b638fca662c5e68556702ff0316c3fc9562c (patch) | |
| tree | b1127cc75b45fd64b216070ed78b57e52db2c30e /src/dpdk | |
| parent | 46e36fffc36753b0e8e3f79f78dc084f26930a82 (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/dpdk')
| -rwxr-xr-x | src/dpdk/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 71839e26..af743732 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -29,6 +29,8 @@ ifndef VHOST_USER endif WORK_DIR = dpdk TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done +DPDK_VANILLA = ../../src_vanilla/dpdk +DPDK_CUSE = ../../src_cuse/dpdk # the name has been changed from version to version ifeq ($(DPDK_TAG),v1.6.0r0) @@ -52,6 +54,7 @@ force_make: $(TAG_DONE_FLAG) $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE) $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) -j $(AT)cd `dirname $(CONFIG_FILE)` && git checkout `basename $(CONFIG_FILE)` && cd - + $(AT)echo "VHOST_USER = $(VHOST_USER)" ifeq ($(VHOST_USER),n) $(AT)cd $(WORK_DIR)/lib/librte_vhost/eventfd_link; make endif @@ -65,6 +68,8 @@ install: $(INSTALL_TARGET) clean: cleanse clobber: $(AT)rm -rf $(WORK_DIR) + $(AT)rm -rf $(DPDK_VANILLA) + $(AT)rm -rf $(DPDK_CUSE) # cleanse is for developer who would like to keep the # clone git repo, saving time to fetch again from url @@ -79,6 +84,10 @@ sanity: $(WORK_DIR): $(AT)git clone $(DPDK_URL) + $(AT)mkdir -p $(DPDK_VANILLA) + $(AT)cp -rf ./* $(DPDK_VANILLA) + $(AT)mkdir -p $(DPDK_CUSE) + $(AT)cp -rf ./* $(DPDK_CUSE) $(TAG_DONE_FLAG): $(WORK_DIR) $(AT)cd $(WORK_DIR); git checkout $(DPDK_TAG) |