Moving netdata plugins to /usr/lib/netdata.

This dropps multiarch-coinstallability, however,
all but a few plugins are arch-indep anyway,
and otherwise the package splitting woudn't work.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 21 insertions, 33 deletions

diff --git a/debian/control b/debian/control
index e754ef01a..6c0346a08 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,6 @@ Description: real-time performance monitoring
 Package: netdata-data
 Section: net
 Architecture: all
-Multi-Arch: foreign
 Depends:
  fonts-font-awesome,
  libjs-bootstrap,
diff --git a/debian/netdata.install b/debian/netdata.install
index 96646e8f8..9cc271cd5 100644
--- a/debian/netdata.install
+++ b/debian/netdata.install
@@ -1,14 +1,11 @@
-/etc/netdata/
-/usr/sbin
-/usr/lib/*/netdata/charts.d/*.sh
-/usr/lib/*/netdata/conf.d
-/usr/lib/*/netdata/node.d/*.js
-/usr/lib/*/netdata/node.d/node_modules
-/usr/lib/*/netdata/plugins.d/*.plugin
-/usr/lib/*/netdata/plugins.d/*.sh
-/usr/lib/*/netdata/plugins.d/*.sh.inc
-/usr/lib/*/netdata/plugins.d/cgroup-network
-/usr/lib/*/netdata/python.d/*.py
-/usr/lib/*/netdata/python.d/python_modules
-
-debian/netdata.conf /etc/netdata/
+/etc/netdata
+/usr/lib/netdata/charts.d/*.sh
+/usr/lib/netdata/conf.d
+/usr/lib/netdata/node.d/*.js
+/usr/lib/netdata/node.d/node_modules
+/usr/lib/netdata/plugins.d/*.plugin
+/usr/lib/netdata/plugins.d/*.sh
+/usr/lib/netdata/plugins.d/*.sh.inc
+/usr/lib/netdata/plugins.d/cgroup-network
+/usr/lib/netdata/python.d/*.py
+/usr/lib/netdata/python.d/python_modules
diff --git a/debian/netdata.postinst.in b/debian/netdata.postinst
index 157cde366..c99048900 100755
--- a/debian/netdata.postinst.in
+++ b/debian/netdata.postinst
@@ -29,9 +29,9 @@ case "${1}" in
 		done
 
 		# handling plugin capabilities (or setuid as fallback)
-		chown -R root:netdata /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d
-		setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin || \
-			chmod 4754 /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin
+		chown -R root:netdata /usr/lib/netdata/plugins.d
+		setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/netdata/plugins.d/apps.plugin || \
+			chmod 4754 /usr/lib/netdata/plugins.d/apps.plugin
 
 		# handling log owner and permissions
 		chown netdata:adm /var/log/netdata
diff --git a/debian/rules b/debian/rules
index 9eadb4c0b..6ba1e769a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-# Find the arch we are building for, as this determines
-# the location of plugins in /usr/lib
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TOP = $(CURDIR)/debian/netdata
 
 VERSION := $(shell dpkg-parsechangelog -SVersion)
@@ -17,8 +14,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -O3
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-MULTIARCH_INSTALL = debian/netdata.postinst
-
 %:
 	dh $@
 
@@ -44,12 +39,9 @@ override_dh_autoreconf_clean:
 	dh_autoreconf_clean
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) --disable-x86-sse --enable-plugin-freeipmi --with-math
-
-$(MULTIARCH_INSTALL): % : %.in
-	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
+	dh_auto_configure -- --libdir=/usr/lib --libexecdir=/usr/lib --disable-x86-sse --enable-plugin-freeipmi --with-math
 
-override_dh_install: $(MULTIARCH_INSTALL)
+override_dh_install:
 	# Remove unneeded .keep files
 	find debian/tmp -name .keep -delete
 
@@ -69,8 +61,8 @@ override_dh_fixperms-arch:
 	# apps.plugin should only be runnable by the netdata user. It will be
 	# given extra capabilities in the postinst script.
 	#
-	chmod 0754 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/apps.plugin
-	chmod 0644 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/loopsleepms.sh.inc
-	chmod 4754 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/freeipmi.plugin
-	chmod 0644 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/charts.d/*.sh
-	chmod 0644 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/python.d/*.py
+	chmod 0754 $(TOP)/usr/lib/netdata/plugins.d/apps.plugin
+	chmod 0644 $(TOP)/usr/lib/netdata/plugins.d/loopsleepms.sh.inc
+	chmod 4754 $(TOP)/usr/lib/netdata/plugins.d/freeipmi.plugin
+	chmod 0644 $(TOP)/usr/lib/netdata/charts.d/*.sh
+	chmod 0644 $(TOP)/usr/lib/netdata/python.d/*.py