diff options
| author |   Matthias Runge <mrunge@redhat.com> | 2019-05-08 11:55:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-08 11:55:38 +0000 |
| commit | d9737cbfef39c0f45fa21c7fc28035039c9d17a6 (patch) | |
| tree | ad74a4ce61d1428be8163652637af2aa58ec9b28 /src/collectd | |
| parent | 46832aaa20b6ca7963e7230928d329383687c56e (diff) | |
| parent | 48bd4b945262edf8558abd9c0dacdd18fe8ef84b (diff) | |
Merge "docker: Add support for experimental collectd container"
Diffstat (limited to 'src/collectd')
| -rw-r--r-- | src/collectd/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile index f6766439..8eea00fd 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -39,11 +39,6 @@ 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) @@ -73,8 +68,6 @@ config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure @echo "Configure done" force_make: $(WORK_DIR)/Makefile - $(AT)cd $(WORK_DIR) && git pull $(COLLECTD_URL) $(COLLECTD_TAG) - @echo "git pull done" $(AT) $(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS) @echo "Make done" @@ -117,13 +110,11 @@ sanity: .PHONY: boot # boot collectd is the process to produce the script 'configure' -boot $(WORK_DIR)/configure: +boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG) @echo "booting up collectd" $(AT)cd $(WORK_DIR); $(BUILD_CMD) @echo "done booting collectd" -boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG) - $(WORK_DIR): $(AT)git clone $(COLLECTD_URL) @@ -133,4 +124,8 @@ $(TAG_DONE_FLAG): $(WORK_DIR) ifneq ($(PATCH_FILE),) $(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE) endif +ifeq ($(COLLECTD_USE_EXPERIMENTAL_PR), y) + @echo "Applying experimental pull requests" + $(AT)cd $(WORK_DIR); ../collectd_apply_pull_request.sh +endif $(AT)touch $@ |