Properly include eBPF collector in binary packages. (#9450)
Austin S. Hemmelgarn committed
Jul 13, 2020 at 07:25 UTC
690fbcefd3ae0cbc858870ad64d320f6f251e5fc
4 files changed
+23
-3
contrib/debian/rules
+5
@@ -76,6 +76,8 @@ override_dh_install:
76
ln -s "/usr/share/netdata/www/$$D" "$(TOP)/var/lib/netdata/www/$$D"; \
77
done
78
79
+ packaging/bundle-ebpf.sh . ${TOP}/usr/libexec/netdata/plugins.d
80
+
81
# Install go
82
#
83
debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/netdata $(TOP)/usr/libexec/netdata
@@ -93,6 +95,9 @@ override_dh_installdocs:
95
--target $(TOP)/usr/share/doc/netdata/ \
96
{} \;
97
98
+override_dh_shlibdeps:
99
+ dh_shlibdeps -X libnetdata_ebpf
100
+
101
override_dh_fixperms:
102
dh_fixperms
103
netdata.spec.in
+1
@@ -412,6 +412,7 @@ install_go
412
install -m 0640 -p go.d.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/go.d.plugin"
413
414
${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-dashboard.sh ${RPM_BUILD_DIR}/%{name}-%{version} ${RPM_BUILD_ROOT}%{_datadir}/%{name}/web
415
+${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-ebpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d
416
417
%pre
418
packaging/bundle-dashboard.sh
+3
-3
@@ -6,9 +6,9 @@ WEBDIR="${2}"
6
DASHBOARD_TARBALL="dashboard.tar.gz"
7
DASHBOARD_VERSION="$(cat "${SRCDIR}/packaging/dashboard.version")"
8
9
-mkdir -p "${SRCDIR}/tmp"
9
+mkdir -p "${SRCDIR}/tmp/dashboard"
10
curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/dashboard/releases/download/${DASHBOARD_VERSION}/${DASHBOARD_TARBALL}" > "${DASHBOARD_TARBALL}" || exit 1
11
sha256sum -c "${SRCDIR}/packaging/dashboard.checksums" || exit 1
12
-tar -xzf "${DASHBOARD_TARBALL}" -C "${SRCDIR}/tmp" || exit 1
12
+tar -xzf "${DASHBOARD_TARBALL}" -C "${SRCDIR}/tmp/dashboard" || exit 1
13
# shellcheck disable=SC2046
14
-cp -a $(find "${SRCDIR}/tmp/build" -mindepth 1 -maxdepth 1) "${WEBDIR}"
14
+cp -a $(find "${SRCDIR}/tmp/dashboard/build" -mindepth 1 -maxdepth 1) "${WEBDIR}"
packaging/bundle-ebpf.sh
new
+14
@@ -0,0 +1,14 @@
1
+#!/bin/sh
2
+
3
+SRCDIR="${1}"
4
+PLUGINDIR="${2}"
5
+
6
+EBPF_VERSION="$(cat "${SRCDIR}/packaging/ebpf.version")"
7
+EBPF_TARBALL="netdata-kernel-collector-glibc-${EBPF_VERSION}.tar.xz"
8
+
9
+mkdir -p "${SRCDIR}/tmp/ebpf"
10
+curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/kernel-collector/releases/download/${EBPF_VERSION}/${EBPF_TARBALL}" > "${EBPF_TARBALL}" || exit 1
11
+sha256sum -c --ignore-missing "${SRCDIR}/packaging/ebpf.checksums" || exit 1
12
+tar -xaf "${EBPF_TARBALL}" -C "${SRCDIR}/tmp/ebpf" || exit 1
13
+# shellcheck disable=SC2046
14
+cp -a $(find "${SRCDIR}/tmp/ebpf" -mindepth 1 -maxdepth 1) "${PLUGINDIR}"