summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaras Chornyi <tarasx.chornyi@intel.com>2016-09-28 15:49:30 +0100
committerTaras Chornyi <tarasx.chornyi@intel.com>2016-09-28 15:49:30 +0100
commitbf4ef8881e5dfe7dedf149c4ae75909c712bb329 (patch)
treee11c427d256f97daf4a95a617b2d785f46b3e1b9
parent0a461892f7425ec6c35948508fdc9a3b010512f3 (diff)
src: build collectd from main repo
Change-Id: I6041b6c1eb7f37ce3e2f17f1a42cb2cba79e9672 Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>
-rw-r--r--src/collectd/Makefile4
-rw-r--r--src/package-list.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 58cebb58..1cff9364 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -23,7 +23,7 @@
include ../mk/master.mk
include ../package-list.mk
-WORK_DIR = collectd-with-DPDK
+WORK_DIR = collectd
TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_TAG).done
BUILD_CMD = ./build.sh
CONFIG_CMD =
@@ -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); git rebase master
+ $(AT)cd $(WORK_DIR); git checkout $(COLLECTD_TAG)
ifneq ($(PATCH_FILE),)
$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
endif
diff --git a/src/package-list.mk b/src/package-list.mk
index 61d7abf1..a64489da 100644
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -9,8 +9,8 @@ DPDK_URL ?= http://dpdk.org/git/dpdk
DPDK_TAG ?= v16.04
# collectd section
-COLLECTD_URL ?= https://github.com/maryamtahhan/collectd-with-DPDK
-COLLECTD_TAG ?= dpdkstat
+COLLECTD_URL ?= https://github.com/collectd/collectd
+COLLECTD_TAG ?= master
COLLECTD_CEILOMETER_URL ?= https://github.com/openstack/collectd-ceilometer-plugin
COLLECTD_CEILOMETER_TAG ?= stable/mitaka