src: update make install for DPDK

[vswitchperf.git] / src / dpdk / Makefile

diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile
index 1f4ca0a..25ec3f1 100755 (executable)
--- a/src/dpdk/Makefile
+++ b/src/dpdk/Makefile
@@ -24,8 +24,13 @@ include ../package-list.mk
 
 .PHONY: install force_make
 
+ifndef VHOST_USER
+    VHOST_USER = n
+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)
@@ -41,8 +46,19 @@ all: force_make
 
 INSTALL_TARGET = force_make
 
+# modify CONFIG_FILE to enable VHOST_USER build and restore original CONFIG_FILE after the build
 force_make: $(TAG_DONE_FLAG)
-       $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) -j
+       $(AT)cd $(WORK_DIR) && git pull $(DPDK_URL) $(DPDK_TAG)
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE)
+       $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE)
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE)
+       $(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 DESTDIR=$(WORK_DIR)
+       $(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
        @echo "Make done"
 
 install: $(INSTALL_TARGET)
@@ -50,13 +66,16 @@ install: $(INSTALL_TARGET)
        @echo "install done"
 
 # hard way to clean and clobber
-clean: cleanse
+clean:
+       $(AT)cd $(WORK_DIR) && git clean -xfd *.o
 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
+# distclean is for developer who would like to keep the
 # clone git repo, saving time to fetch again from url
-cleanse:
+distclean:
        $(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f
 
 test:
@@ -67,10 +86,11 @@ 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)
-       $(AT)sed -i 's/CONFIG_RTE_BUILD_COMBINE_LIBS=n/CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE)
-       $(AT)sed -i 's/CONFIG_RTE_LIBRTE_VHOST=n/CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE)
-       $(AT)sed -i 's/CONFIG_RTE_LIBRTE_KNI=y /CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE)
        $(AT)touch $@