Fix handling of eBPF plugin for DEB packages. (#15117)

2 files changed, 16 insertions, 15 deletions

diff --git a/contrib/debian/control b/contrib/debian/control
index f4a767b320..1c1e10b14f 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -99,7 +99,7 @@ Description: The charts.d metrics collection plugin for the Netdata Agent
  LibreSWAN, OpenSIPS, and Wireless access point statistics.
 
 Package: netdata-plugin-ebpf
-Architecture: any
+Architecture: amd64
 Depends: ${shlibs:Depends},
          netdata (>= ${source:Version})
 Recommends: netdata-ebpf-code-legacy (>= ${source:Version}),
@@ -110,7 +110,7 @@ Description: The eBPF metrics collection plugin for the Netdata Agent
  detailed kernel-level metrics for the system.
 
 Package: netdata-ebpf-code-legacy
-Architecture: i386 amd64
+Architecture: amd64
 Depends: netdata-plugin-ebpf (= ${source:Version})
 Conflicts: netdata (< ${source:Version})
 Description: Compiled eBPF legacy code for the Netdata eBPF plugin
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 626b5a69ff..bf80870dec 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -15,7 +15,7 @@ else
 SYSTEMD_UNIT = system/systemd/netdata.service
 endif
 
-ifeq ($(shell test `uname -m` != "x86_64" && echo "1"), 1)
+ifeq ($(shell test ${DEB_TARGET_ARCH} != "amd64" && echo "1"), 1)
 HAVE_EBPF = 0
 EBPF_CONFIG = --disable-ebpf
 else
@@ -82,14 +82,13 @@ override_dh_install:
 	$(TOP)-plugin-chartsd/usr/lib/netdata/conf.d/charts.d
 
 	# Add ebpf plugin install rules
-	[ $(HAVE_EBPF) -eq 1 ] && mkdir -p $(TOP)-plugin-ebpf/usr/libexec/netdata/plugins.d/
-	[ $(HAVE_EBPF) -eq 1 ] && mkdir -p $(TOP)-plugin-ebpf/usr/lib/netdata/conf.d/
-	[ $(HAVE_EBPF) -eq 1 ] && mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/ebpf.plugin \
-	$(TOP)-plugin-ebpf/usr/libexec/netdata/plugins.d/ebpf.plugin
-	[ $(HAVE_EBPF) -eq 1 ] && mv -f $(TEMPTOP)/usr/lib/netdata/conf.d/ebpf.d.conf \
-	$(TOP)-plugin-ebpf/usr/lib/netdata/conf.d/ebpf.d.conf
-	[ $(HAVE_EBPF) -eq 1 ] && mv -f $(TEMPTOP)/usr/lib/netdata/conf.d/ebpf.d \
-	$(TOP)-plugin-ebpf/usr/lib/netdata/conf.d/ebpf.d
+	if [ $(HAVE_EBPF) -eq 1 ]; then \
+		mkdir -p $(TOP)-plugin-ebpf/usr/libexec/netdata/plugins.d/; \
+		mkdir -p $(TOP)-plugin-ebpf/usr/lib/netdata/conf.d/; \
+		mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/ebpf.plugin $(TOP)-plugin-ebpf/usr/libexec/netdata/plugins.d/ebpf.plugin; \
+		mv -f $(TEMPTOP)/usr/lib/netdata/conf.d/ebpf.d.conf $(TOP)-plugin-ebpf/usr/lib/netdata/conf.d/ebpf.d.conf; \
+		mv -f $(TEMPTOP)/usr/lib/netdata/conf.d/ebpf.d $(TOP)-plugin-ebpf/usr/lib/netdata/conf.d/ebpf.d; \
+	fi
 
 	# Add python plugin install rules
 	mkdir -p $(TOP)-plugin-pythond/usr/libexec/netdata/plugins.d/
@@ -145,8 +144,10 @@ override_dh_install:
 
 	# Handle eBPF code
 	#
-	[ $(HAVE_EBPF) -eq 1 ] && mkdir -p $(TOP)-plugin-ebpf-code/usr/libexec/netdata/plugins.d/
-	[ $(HAVE_EBPF) -eq 1 ] && packaging/bundle-ebpf.sh . ${TOP}-plugin-ebpf-code/usr/libexec/netdata/plugins.d/
+	if [ $(HAVE_EBPF) -eq 1 ]; then \
+		mkdir -p $(TOP)-ebpf-code-legacy/usr/libexec/netdata/plugins.d/; \
+		packaging/bundle-ebpf.sh . ${TOP}-ebpf-code-legacy/usr/libexec/netdata/plugins.d/; \
+	fi
 
 	# Install go to it's own package directory
 	#
@@ -215,5 +216,5 @@ override_dh_clean:
 
 	# Tidy up copied/generated files
 	#
-	-[ -r $(CURDIR)/debian/netdata.logrotate ] && rm $(CURDIR)/debian/netdata.logrotate
-	-[ -r $(CURDIR)/debian/netdata.conffiles ] && rm $(CURDIR)/debian/netdata.conffiles
+	[ -r $(CURDIR)/debian/netdata.logrotate ] && rm $(CURDIR)/debian/netdata.logrotate ; true
+	[ -r $(CURDIR)/debian/netdata.conffiles ] && rm $(CURDIR)/debian/netdata.conffiles ; true