src: Fixed dpdkstats and ceilometer-plugin build issues.

Change-Id: Ie8abb8e6be3c5c2100b672c83f488177c8b66638
Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>

diff --git a/src/collectd-ceilometer-plugin/Makefile b/src/collectd-ceilometer-plugin/Makefile
index b0ad411..20461e5 100644 (file)
--- 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 2233149..58cebb5 100644 (file)
--- 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