diff options
| author |   Aaron Smith <aasmith@redhat.com> | 2018-09-10 12:01:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-10 12:01:36 +0000 |
| commit | b52c942a4fbfc5023780d23954de953b817c6dc0 (patch) | |
| tree | 5ecef4654e823b8cc151ded4e0234ed72d312c97 /src/collectd/Makefile | |
| parent | fbbfee45410a4a0766c61227751621c4463741bb (diff) | |
| parent | b20fa77aef9d184afa2dadba619afc12878ae67b (diff) | |
Merge "Add support for 'collectd-master' container"
Diffstat (limited to 'src/collectd/Makefile')
| -rw-r--r-- | src/collectd/Makefile | 10 |
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) |