build: Rename cloned repositories and remove cuse

VSPERF expects folders to be named a certain way, but this may not be
the case if another repository is specified via the package-list.mk
file. One example of this is the DPDK stable repo which gets cloned to
the "dpdk-stable" directory unless otherwise specified. Thus Makefiles
were updated to enforce expected folder names.

Unused configuration related to vHostCuse support was removed.

Change-Id: Ifa48898d51e96c72e7d740f43cb635d729b2a796
Signed-off-by: Cian Ferriter <cian.ferriter@intel.com>
Reviewed-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>

diff --git a/src/Makefile.src_cuse b/src/Makefile.src_cuse
deleted file mode 100644 (file)
index 0ddac4c..0000000
--- a/src/Makefile.src_cuse
+++ /dev/null
@@ -1,33 +0,0 @@
-# Top Makefile to build upstream packages.
-#
-
-# Copyright 2015 OPNFV
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Contributors:
-#   Aihua Li, Huawei Technologies.
-
-include mk/master.mk
-
-export VHOST_USER
-
-# specify upstream package as SUBDIRS - common terms as suggest by gnu-make
-SUBDIRS =
-SUBDIRS += dpdk
-SUBDIRS += ovs
-ovs: dpdk
-WITH_LINUX =
-VHOST_USER = n
-include mk/make-subsys.mk

diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile
index 6967116..4b4330d 100755 (executable)
--- a/src/dpdk/Makefile
+++ b/src/dpdk/Makefile
@@ -99,9 +99,6 @@ ifdef CONFIG_FILE_BASE
        $(AT)cd `dirname $(CONFIG_FILE_BASE)` && git checkout `basename $(CONFIG_FILE_BASE)` && cd -
 endif
        $(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)
@@ -126,7 +123,7 @@ sanity:
        @echo "Make sanity in $(WORK_DIR) (stub) "
 
 $(WORK_DIR):
-       $(AT)git clone $(DPDK_URL)
+       $(AT)git clone $(DPDK_URL) dpdk
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
        $(AT)cd $(WORK_DIR); git checkout $(DPDK_TAG)

diff --git a/src/ovs/Makefile b/src/ovs/Makefile
index ee15c52..e3adc2f 100644 (file)
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -111,7 +111,7 @@ boot $(WORK_DIR)/configure:
 boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
 
 $(WORK_DIR):
-       $(AT)git clone $(OVS_URL)
+       $(AT)git clone $(OVS_URL) ovs
        $(AT)mkdir -p $(OVS_VANILLA)
        $(AT)cp -rf ./* $(OVS_VANILLA)
 

diff --git a/src/qemu/Makefile b/src/qemu/Makefile
index 5f5e941..b105496 100755 (executable)
--- a/src/qemu/Makefile
+++ b/src/qemu/Makefile
@@ -68,7 +68,7 @@ sanity:
 $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
 
 $(WORK_DIR):
-       $(AT)git clone $(QEMU_URL)
+       $(AT)git clone $(QEMU_URL) qemu
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
        $(AT)cd $(WORK_DIR); git checkout $(QEMU_TAG)

diff --git a/src/vpp/Makefile b/src/vpp/Makefile
index de50d94..d3146f4 100644 (file)
--- a/src/vpp/Makefile
+++ b/src/vpp/Makefile
@@ -66,7 +66,7 @@ sanity:
 $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
 
 $(WORK_DIR):
-       $(AT)git clone $(VPP_URL)
+       $(AT)git clone $(VPP_URL) vpp
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
        $(AT)cd vpp; git checkout $(VPP_TAG)