From 5589d7589aa860429e2975af7a7c90b265270351 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 9 Feb 2019 21:41:10 +0100 Subject: Workarounding different source directories and debhelper install files FTBFS by installing netdata.conf manually. Signed-off-by: Daniel Baumann --- debian/netdata-core.install | 2 -- debian/rules | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/netdata-core.install b/debian/netdata-core.install index 290400f7f..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/netdata.conf /etc/netdata diff --git a/debian/rules b/debian/rules index 3e4a92db0..61afbe0e8 100755 --- a/debian/rules +++ b/debian/rules @@ -75,6 +75,9 @@ override_dh_install-arch: find debian/tmp -name .keep -delete # Copy architecture dependent plugins + mkdir -p $(TOP)-core/etc/netdata + cp debian/netdata.conf $(TOP)-core/etc/netdata + mkdir -p $(TOP)-core/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin freeipmi.plugin; \ do \ @@ -86,6 +89,9 @@ ifneq (,,$(findstring no-sse,$(PACKAGES))) find debian/tmp-core-no-sse -name .keep -delete dh_install -p netdata-core-no-sse --sourcedir=debian/tmp-core-no-sse + mkdir -p $(TOP)-core-no-sse/etc/netdata + cp debian/netdata.conf $(TOP)-core-no-sse/etc/netdata + mkdir -p $(TOP)-core-no-sse/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin freeipmi.plugin; \ do \ -- cgit v1.2.3