summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-08-26 16:07:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-08-26 16:07:50 +0000
commit1e857e0abba457e3e8aed8562b4f334ff1fa806a (patch)
tree825d5279be8c88fe55d7c62e485051457d0239cc
parentReleasing debian version 1.16.1-3. (diff)
downloadnetdata-1e857e0abba457e3e8aed8562b4f334ff1fa806a.tar.xz
netdata-1e857e0abba457e3e8aed8562b4f334ff1fa806a.zip
Using rules to install netdata configuration to fix FTBFS on i386.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/netdata-core.install2
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/netdata-core.install b/debian/netdata-core.install
index 15df7efda..67ee41dc3 100644
--- a/debian/netdata-core.install
+++ b/debian/netdata-core.install
@@ -8,5 +8,3 @@ usr/lib/netdata/conf.d/health_email_recipients.conf
usr/lib/netdata/conf.d/statsd.d
usr/lib/netdata/conf.d/stream.conf
usr/sbin
-
-debian/local/netdata/netdata.conf /etc/netdata
diff --git a/debian/rules b/debian/rules
index ed65ae8ad..cf3c0cc99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ override_dh_install-arch:
# Copy architecture dependent plugins
mkdir -p $(TOP)-core/etc/netdata
+ cp debian/local/netdata/netdata.conf $(TOP)-core/etc/netdata
touch $(TOP)-core/etc/netdata/.opt-out-from-anonymous-statistics
mkdir -p $(TOP)-core/usr/lib/netdata/plugins.d
@@ -93,6 +94,7 @@ ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES)))
dh_install -p netdata-core-no-sse --sourcedir=debian/tmp-core-no-sse
mkdir -p $(TOP)-core-no-sse/etc/netdata
+ cp debian/local/netdata/netdata.conf $(TOP)-core-no-sse/etc/netdata
touch $(TOP)-core-no-sse/etc/netdata/.opt-out-from-anonymous-statistics
mkdir -p $(TOP)-core-no-sse/usr/lib/netdata/plugins.d