aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore10
-rwxr-xr-xci/build-vsperf.sh4
-rw-r--r--src/Makefile.src_cuse33
-rwxr-xr-xsrc/dpdk/Makefile5
-rw-r--r--src/ovs/Makefile2
-rwxr-xr-xsrc/qemu/Makefile2
-rw-r--r--src/vpp/Makefile2
7 files changed, 16 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore
index 9d803438..48751193 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,16 @@ target/
/src/dpdk/dpdk/
/src/ovs/ovs/
/src/qemu/qemu/
+/src/vpp/vpp/
/src_cuse/
/src_vanilla/
.vagrant
+tags
+
+# Ignore all files in l2fwd except those prefaced by "!"
+/src/l2fwd
+!/src/l2fwd/gen_debian_package.sh
+!/src/l2fwd/l2fwd.c
+!/src/l2fwd/LICENSE.txt
+!/src/l2fwd/Makefile
+
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh
index 30069c47..cee0e525 100755
--- a/ci/build-vsperf.sh
+++ b/ci/build-vsperf.sh
@@ -80,10 +80,10 @@ fi
# Test report related configuration
TEST_REPORT_PARTIAL="*_test_report.rst"
-TEST_REPORT_DIR="${WORKSPACE}/docs/testing/developer/results"
+TEST_REPORT_DIR="${WORKSPACE}/docs/testing/developer/devguide/results"
TEST_REPORT_INDEX="${TEST_REPORT_DIR}/index.rst"
TEST_REPORT_LINK_OLD="https://wiki.opnfv.org/wiki/vsperf_results"
-TEST_REPORT_FILE="${WORKSPACE}/docs_output/testing/developer/results/index.html"
+TEST_REPORT_FILE="${WORKSPACE}/docs_output/testing_developer_devguide_results/index.html"
TEST_REPORT_TARBALL="vswitchperf_logs_${DATE}.tar.gz"
if [[ "x${BRANCH}" == "xmaster" ]]; then
diff --git a/src/Makefile.src_cuse b/src/Makefile.src_cuse
deleted file mode 100644
index 0ddac4cb..00000000
--- 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 69671169..4b4330d7 100755
--- 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 ee15c521..e3adc2f8 100644
--- 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 5f5e941f..b105496c 100755
--- 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 de50d941..d3146f46 100644
--- 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)