Fix bundling of eBPF legacy code for DEB packages. (#15127)
Fix bundling of eBPF code legacy code for DEB packages.
Austin S. Hemmelgarn committed
Jun 1, 2023 at 06:57 UTC
8028ea9aa9f5a7951ea4ecc7a6e1e8d8396edcbf
2 files changed
+4
-3
contrib/debian/rules
+1
-1
@@ -151,7 +151,7 @@ override_dh_install:
151
#
152
if [ $(HAVE_EBPF) -eq 1 ]; then \
153
mkdir -p $(TOP)-ebpf-code-legacy/usr/libexec/netdata/plugins.d/; \
154
- packaging/bundle-ebpf.sh . ${TOP}-ebpf-code-legacy/usr/libexec/netdata/plugins.d/; \
154
+ packaging/bundle-ebpf.sh . ${TOP}-ebpf-code-legacy/usr/libexec/netdata/plugins.d/ force; \
155
fi
156
157
# Install go to it's own package directory
packaging/bundle-ebpf.sh
+3
-2
@@ -2,15 +2,16 @@
2
3
SRCDIR="${1}"
4
PLUGINDIR="${2}"
5
+FORCE="${3}"
6
7
EBPF_VERSION="$(cat "${SRCDIR}/packaging/ebpf.version")"
8
EBPF_TARBALL="netdata-kernel-collector-glibc-${EBPF_VERSION}.tar.xz"
9
9
-if [ -x "${PLUGINDIR}/ebpf.plugin" ] ; then
10
+if [ -x "${PLUGINDIR}/ebpf.plugin" ] || [ "${FORCE}" = "force" ]; then
11
mkdir -p "${SRCDIR}/tmp/ebpf"
12
curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/kernel-collector/releases/download/${EBPF_VERSION}/${EBPF_TARBALL}" > "${EBPF_TARBALL}" || exit 1
13
grep "${EBPF_TARBALL}" "${SRCDIR}/packaging/ebpf.checksums" | sha256sum -c - || exit 1
13
- tar -xaf "${EBPF_TARBALL}" -C "${SRCDIR}/tmp/ebpf" || exit 1
14
+ tar -xvaf "${EBPF_TARBALL}" -C "${SRCDIR}/tmp/ebpf" || exit 1
15
if [ ! -d "${PLUGINDIR}/ebpf.d" ];then
16
mkdir "${PLUGINDIR}/ebpf.d"
17
fi