aboutsummaryrefslogtreecommitdiffstats
path: root/src/collectd/Makefile
diff options
context:
space:
mode:
authorRadoslaw Jablonski <radoslawx.jablonski@intel.com>2018-07-27 15:32:54 +0100
committerRadoslaw Jablonski <radoslawx.jablonski@intel.com>2018-09-07 08:45:23 +0100
commitb20fa77aef9d184afa2dadba619afc12878ae67b (patch)
treeaddad04a31b2a73ed74f9196321ab8461277f731 /src/collectd/Makefile
parent1db7418e39d41cb92e3b1af71d2cb4b9fabb29f2 (diff)
Add support for 'collectd-master' container
'collectd-master' contains development versions of collectd with the latest features. It is based on master branch from collect repository. Change-Id: I720b5e5938b402281674ee73851c5f611e4d1178 Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
Diffstat (limited to 'src/collectd/Makefile')
-rw-r--r--src/collectd/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 670c14fa..13121700 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -39,6 +39,11 @@ ifeq ($(XDG_CACHE_HOME_DIR),)
XDG_CACHE_HOME_DIR = $(shell echo $$HOME)
endif
+SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
+ifdef COLLECTD_USE_MASTER
+SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master
+endif
+
CONFIG_CMD += --enable-syslog
CONFIG_CMD += --enable-logfile
CONFIG_CMD += --with-libpqos=$(LIBPQOS_DIR)
@@ -82,7 +87,9 @@ ifndef DOCKER
endif
$(AT)sudo ./ovs_pmd_stats_config.sh
$(AT)sudo ./snmp_mib_config.sh
- $(AT)sudo ./include_config.sh
+
+ @echo "Using sample configs: $(SAMPLE_CONF_VARIANT_NAME)"
+ $(AT)sudo ./include_config.sh $(SAMPLE_CONF_VARIANT_NAME)
@echo "Make install done"
install: force_install
@@ -118,6 +125,7 @@ $(WORK_DIR):
$(AT)git clone $(COLLECTD_URL)
$(TAG_DONE_FLAG): $(WORK_DIR)
+ @echo "Checking out collectd from tag: $(COLLECTD_TAG)"
$(AT)cd collectd; git checkout $(COLLECTD_TAG)
ifneq ($(PATCH_FILE),)
$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)