summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Goldammer <martin.goldammer6@gmail.com>2017-09-05 03:12:24 -0700
committerMartin Goldammer <martin.goldammer6@gmail.com>2017-09-05 03:28:09 -0700
commit2cfae5e4569bf595e238a4ccb56a6ef5544a3265 (patch)
treee4889680b6c3ad9183905b06c6db51ade24aa4fb
parent7608b5f5b73af88bd22e1825a013cbcd123050ac (diff)
trex: fix Trex makefile
Trex makefile was fix to checkout correct commit ID. Add trex repo folder to .gitignore file. JIRA: VSPERF-528 Change-Id: Icd0406eaf088b88c28d90cf8a7dd9e1fa53a6f3b Signed-off-by: Martin Goldammer <martin.goldammer6@gmail.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: Trevor Cooper <trevor.cooper@intel.com>
-rw-r--r--.gitignore1
-rw-r--r--src/trex/Makefile3
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 48751193..97dbd7d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ target/
/src/vpp/vpp/
/src_cuse/
/src_vanilla/
+/src/trex/trex
.vagrant
tags
diff --git a/src/trex/Makefile b/src/trex/Makefile
index 9aaaa203..41eb52ab 100644
--- a/src/trex/Makefile
+++ b/src/trex/Makefile
@@ -26,7 +26,7 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(TREX_TAG).done
all: force_pull
@echo "Finished pulling $(WORK_DIR) "
-force_pull: $(WORK_DIR) Makefile
+force_pull: $(TAG_DONE_FLAG)
$(AT)cd $(WORK_DIR) && git pull $(TREX_URL) $(TREX_TAG)
@echo "git pull done"
@@ -35,6 +35,7 @@ $(WORK_DIR):
$(TAG_DONE_FLAG): $(WORK_DIR)
$(AT)cd $(WORK_DIR); git checkout $(TREX_TAG)
+ $(AT)touch $@
install:
@echo "Make install in $(WORK_DIR) (stub) "