Merge "makefile: update collectd Makefile with intel_pmu configuration"

[barometer.git] / src / collectd / Makefile

diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 0e16cfa..8fd7894 100644 (file)
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -24,27 +24,23 @@ 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 =
 CONFIG_CMD += ./configure
 
-# DPDK_DIR is the directory where DPDK shared lib is installed
-DPDK_DIR = $(shell echo $$DPDK_DIR)
-ifeq ($(DPDK_DIR),)
-DPDK_DIR = /usr
-endif
-
 LIBPQOS_DIR = $(shell echo $$LIBPQOS_DIR)
 ifeq ($(LIBPQOS_DIR),)
 LIBPQOS_DIR = /usr
 endif
 
+XDG_CACHE_HOME_DIR = $(shell echo $$XDG_CACHE_HOME)
+ifeq ($(XDG_CACHE_HOME_DIR),)
+XDG_CACHE_HOME_DIR = $(shell echo $$HOME)
+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
@@ -57,14 +53,12 @@ CONFIG_CMD += --enable-threshold
 #force_install: force_make
 
 all: force_make
-       @echo "Finished making $(WORK_DIR) "
+       @echo "Finished making $(WORK_DIR)"
 
 config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure
        $(AT)cd $(WORK_DIR); $(CONFIG_CMD)
        @echo "Configure done"
 
-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"
@@ -75,15 +69,15 @@ force_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)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_RAWIO CAP_SYS_ADMIN/g' /etc/systemd/system/collectd.service
+       $(AT)sed -i -e 's|Environment=\(.*\)|Environment=XDG_CACHE_HOME='$(XDG_CACHE_HOME_DIR)' \1|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
+       @echo "Make install done"
+
+install: force_install
 
-install: $(INSTALL_TARGET)
 
 # hard way to clean and clobber
 clean:
@@ -115,7 +109,7 @@ $(WORK_DIR):
        $(AT)git clone $(COLLECTD_URL)
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
-       $(AT)cd $(WORK_DIR); git checkout $(COLLECTD_TAG)
+       $(AT)cd collectd; git checkout $(COLLECTD_TAG)
 ifneq ($(PATCH_FILE),)
        $(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
 endif