diff options
| author |   Maryam Tahhan <maryam.tahhan@intel.com> | 2016-12-02 17:32:22 +0000 |
|---|---|---|
| committer | Maryam Tahhan <maryam.tahhan@intel.com> | 2016-12-05 13:17:43 +0000 |
| commit | 843ea84d9da3a4a20a7ad388d94ae8c861380254 (patch) | |
| tree | 47ee1849d62e4aee406abceeed7e28009ae2cdf0 /src/collectd/Makefile | |
| parent | 791bf2a756c8d4e7e7b2937481ee2d8d5d95fb97 (diff) | |
src: build all dependencies and plugins
Build all dependencies and plugins. Provide sample plugin configurations and
update user guide.
Change-Id: I5170c84529e514e12bb1bd4dc34ecdd93eb764d7
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Diffstat (limited to 'src/collectd/Makefile')
| -rw-r--r-- | src/collectd/Makefile | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile index 1cff9364..0e16cfac 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -24,6 +24,7 @@ include ../mk/master.mk include ../package-list.mk WORK_DIR = collectd +SAMPLE_CONFIG = $(CURDIR)/collectd_sample_configs TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_TAG).done BUILD_CMD = ./build.sh CONFIG_CMD = @@ -35,14 +36,25 @@ ifeq ($(DPDK_DIR),) DPDK_DIR = /usr endif +LIBPQOS_DIR = $(shell echo $$LIBPQOS_DIR) +ifeq ($(LIBPQOS_DIR),) +LIBPQOS_DIR = /usr +endif + + CONFIG_CMD += --enable-syslog CONFIG_CMD += --enable-logfile CONFIG_CMD += --with-libdpdk=$(DPDK_DIR) +CONFIG_CMD += --with-libpqos=$(LIBPQOS_DIR) +CONFIG_CMD += --with-hugepages +CONFIG_CMD += --enable-exec +CONFIG_CMD += --enable-python +CONFIG_CMD += --enable-threshold .PHONY: install force_install config force_make # install depends on make -force_install: force_make +#force_install: force_make all: force_make @echo "Finished making $(WORK_DIR) " @@ -56,11 +68,20 @@ INSTALL_TARGET = force_install force_make 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) + $(AT) $(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS) @echo "Make done" force_install: - $(AT)sudo $(MAKE) -C $(WORK_DIR) install + $(AT)$(MAKE) -C $(WORK_DIR) install + $(AT)cp $(WORK_DIR)/contrib/systemd.collectd.service /etc/systemd/system/ + $(AT)mv /etc/systemd/system/systemd.collectd.service /etc/systemd/system/collectd.service + $(AT)chmod +x /etc/systemd/system/collectd.service + $(AT)sed -i -e 's/ExecStart=\/usr\/sbin\/collectd/ExecStart=\/opt\/collectd\/sbin\/collectd/g' /etc/systemd/system/collectd.service + $(AT)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID/g' /etc/systemd/system/collectd.service + $(AT)systemctl daemon-reload + $(AT)sudo mkdir -p /opt/collectd/etc/collectd.conf.d + $(AT)sudo cp $(SAMPLE_CONFIG)/* /opt/collectd/etc/collectd.conf.d + $(AT)sudo ./include_config.sh install: $(INSTALL_TARGET) |