X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcollectd%2FMakefile;fp=src%2Fcollectd%2FMakefile;h=ec45f9410a96024b4936c9a55451eb2d48facbdc;hb=28517f841a3261987114869e04624cdd686c31a5;hp=7eb312dabc583ee731d5b20ffd25980b15293a4a;hpb=923175d15112a865f3f51e80dab88922c17340d6;p=barometer.git

diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 7eb312da..ec45f941 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -25,7 +25,8 @@ include ../mk/master.mk
 include ../package-list.mk
 
 WORK_DIR = collectd
-TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_TAG).done
+# $COLLECTD_TAG can contain "/", which is being replaced with "-" here
+TAG_DONE_FLAG := $(WORK_DIR)/.$(subst /,-,"$(COLLECTD_TAG)").done
 BUILD_CMD = ./build.sh
 CONFIG_CMD =
 CONFIG_CMD += ./configure
@@ -121,7 +122,7 @@ $(WORK_DIR):
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
 	@echo "Checking out collectd from tag: $(COLLECTD_TAG)"
-	$(AT)cd collectd; git checkout $(COLLECTD_TAG)
+	$(AT)cd collectd; git fetch origin $(COLLECTD_TAG); git checkout FETCH_HEAD
 ifneq ($(PATCH_FILE),)
 	$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
 endif