From eaf66887b3a8a80c0e52906d3182f93d52f8e8ba Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Thu, 30 Jul 2015 13:43:23 +0100 Subject: src/ovs: Add support for building vanilla OVS with kernel module DPDK build remains the default. JIRA: VSPERF-27 Change-Id: I7282e32d2246eaf75e399c5af87ef0ea53981895 Signed-off-by: Timo Puha Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Eugene Snider Reviewed-by: Gurpreet Singh Reviewed-by: Tv Rao --- src/Makefile | 4 ++++ src/ovs/Makefile | 26 ++++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index d16b093d..20e78906 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,10 +26,14 @@ export VHOST_USER # specify upstream package as SUBDIRS - common terms as suggest by gnu-make SUBDIRS = SUBDIRS += l2fwd +ifeq ($(WITH_LINUX),) SUBDIRS += dpdk +endif SUBDIRS += ovs +ifeq ($(WITH_LINUX),) # specify package dependency here if needed ovs: dpdk +endif include mk/make-subsys.mk diff --git a/src/ovs/Makefile b/src/ovs/Makefile index 68ac0f6d..223d2dcb 100755 --- a/src/ovs/Makefile +++ b/src/ovs/Makefile @@ -22,11 +22,26 @@ include ../mk/master.mk include ../package-list.mk +WORK_DIR = ovs +TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done +CONFIG_CMD = +CONFIG_CMD += ./configure + +# If WITH_LINUX is defined, OVS is built without DPDK but with kernel +# module +# By default, OVS is built with DPDK + +# WITH_LINUX is the Linux kernel build directory used for building +# OVS kernel module as documented in OVS --with-linux switch +ifneq ($(WITH_LINUX),) # Building with Linux kernel +CONFIG_CMD += --with-linux=$(WITH_LINUX) + +else # Building with DPDK + # DPDK_DIR is the top directory for dpdk source tree # it can be passed in from Makefile command # if it is not set, try to read it in from environment # if it is still not set, then set it using relative path - DPDK_DIR ?= $(shell echo $$DPDK_DIR) ifeq ($(DPDK_DIR),) DPDK_DIR = ../../dpdk/dpdk @@ -35,20 +50,15 @@ endif ifeq ($(DPDK_TARGET),) DPDK_TARGET = x86_64-native-linuxapp-gcc endif +CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET) +endif # Kernel vs. DPDK .PHONY: install force_install config force_make # install depends on make force_install: force_make -WORK_DIR = ovs -TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done -CONFIG_CMD = -CONFIG_CMD += ./configure -CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET) - - all: force_make @echo "Finished making $(WORK_DIR) " -- cgit 1.2.3-korg