summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/collectd-ceilometer-plugin/Makefile2
-rw-r--r--src/collectd/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/collectd-ceilometer-plugin/Makefile b/src/collectd-ceilometer-plugin/Makefile
index b0ad4112..20461e50 100644
--- a/src/collectd-ceilometer-plugin/Makefile
+++ b/src/collectd-ceilometer-plugin/Makefile
@@ -35,7 +35,7 @@ INSTALL_TARGET = force_make
force_make: $(WORK_DIR)
@echo "force make"
- $(AT)cd $(WORK_DIR) && git pull $(COLLECTD_CEILOMETER_URL) $(COLLECTD_CEILOMETER_TAG)
+ $(AT)cd $(WORK_DIR) && git checkout $(COLLECTD_CEILOMETER_TAG)
@echo "Make done"
install:
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 2233149b..58cebb58 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -94,7 +94,7 @@ $(WORK_DIR):
$(AT)git clone $(COLLECTD_URL)
$(TAG_DONE_FLAG): $(WORK_DIR)
- $(AT)cd collectd-with-DPDK; git checkout $(COLLECTD_TAG)
+ $(AT)cd collectd-with-DPDK; git checkout $(COLLECTD_TAG); git rebase master
ifneq ($(PATCH_FILE),)
$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
endif