Revert the eBPF package bundling that breaks the release and DEB packages. (#9552)
* Revert "Fix SHA256 handling in eBPF bundling code. (#9546)" This reverts commit 7ff315810e1d2c5871c4e87049687852b2cee7ee. * Revert "Add eBPF bundling script to `make dist`. (#9539)" This reverts commit 3a7961d4176aee63f24c4cbc96dabaa13010d6f1. * Revert "Properly include eBPF collector in binary packages. (#9450)" This reverts commit 690fbcefd3ae0cbc858870ad64d320f6f251e5fc.
James Mills committed
Jul 16, 2020 at 21:34 UTC
1b606bc1b2a16dfbcc8b5c7ed780906b482eef11
5 files changed
+3
-24
Makefile.am
-1
@@ -71,7 +71,6 @@ dist_noinst_DATA = \
71
packaging/mosquitto.version \
72
packaging/mosquitto.checksums \
73
packaging/bundle-dashboard.sh \
74
- packaging/bundle-ebpf.sh \
74
packaging/bundle-mosquitto.sh \
75
packaging/check-kernel-config.sh \
76
packaging/ebpf.checksums \
contrib/debian/rules
-5
@@ -76,8 +76,6 @@ 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
-
79
# Install go
80
#
81
debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/netdata $(TOP)/usr/libexec/netdata
@@ -95,9 +93,6 @@ override_dh_installdocs:
93
--target $(TOP)/usr/share/doc/netdata/ \
94
{} \;
95
98
-override_dh_shlibdeps:
99
- dh_shlibdeps -X libnetdata_ebpf
100
-
96
override_dh_fixperms:
97
dh_fixperms
98
netdata.spec.in
-1
@@ -412,7 +412,6 @@ 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
415
416
%pre
417
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/dashboard"
9
+mkdir -p "${SRCDIR}/tmp"
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/dashboard" || exit 1
12
+tar -xzf "${DASHBOARD_TARBALL}" -C "${SRCDIR}/tmp" || exit 1
13
# shellcheck disable=SC2046
14
-cp -a $(find "${SRCDIR}/tmp/dashboard/build" -mindepth 1 -maxdepth 1) "${WEBDIR}"
14
+cp -a $(find "${SRCDIR}/tmp/build" -mindepth 1 -maxdepth 1) "${WEBDIR}"
packaging/bundle-ebpf.sh
deleted
-14
@@ -1,14 +0,0 @@
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
-grep "${EBPF_TARBALL}" "${SRCDIR}/packaging/ebpf.checksums" | sha256sum -c - || 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}"