Fix libbpf handling in RPM builds. (#11702)
Austin S. Hemmelgarn committed
Oct 22, 2021 at 07:26 UTC
e79fe3fb8b6c734c7c49d52872c821d977892609
2 files changed
+21
-5
netdata.spec.in
+9
-1
@@ -235,7 +235,15 @@ export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging
235
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-judy.sh ${RPM_BUILD_DIR}/%{name}-%{version}
236
%endif
237
%if 0%{?_have_ebpf}
238
-export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version}
238
+%if 0%{?centos_ver:1}
239
+%if %{centos_ver} < 8
240
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} centos7
241
+%else
242
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} centos8
243
+%endif
244
+%else
245
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} other
246
+%endif
247
%endif
248
249
%build
packaging/bundle-libbpf.sh
+12
-4
@@ -1,7 +1,4 @@
1
-#!/bin/sh
2
-
3
-LIBBPF_TARBALL="v$(cat "${1}/packaging/libbpf.version").tar.gz"
4
-LIBBPF_BUILD_PATH="${1}/externaldeps/libbpf/libbpf-$(cat "${1}/packaging/libbpf.version")"
1
+#!/bin/bash
2
3
if [ "$(uname -m)" = x86_64 ]; then
4
lib_subdir="lib64"
@@ -9,6 +6,17 @@ else
6
lib_subdir="lib"
7
fi
8
9
+if [ "${2}" != "centos7" ]; then
10
+ cp "${1}/packaging/current_libbpf.checksums" "${1}/packaging/libbpf.checksums"
11
+ cp "${1}/packaging/current_libbpf.version" "${1}/packaging/libbpf.version"
12
+else
13
+ cp "${1}/packaging/libbpf_0_0_9.checksums" "${1}/packaging/libbpf.checksums"
14
+ cp "${1}/packaging/libbpf_0_0_9.version" "${1}/packaging/libbpf.version"
15
+fi
16
+
17
+LIBBPF_TARBALL="v$(cat "${1}/packaging/libbpf.version").tar.gz"
18
+LIBBPF_BUILD_PATH="${1}/externaldeps/libbpf/libbpf-$(cat "${1}/packaging/libbpf.version")"
19
+
20
mkdir -p "${1}/externaldeps/libbpf" || exit 1
21
curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/libbpf/archive/${LIBBPF_TARBALL}" > "${LIBBPF_TARBALL}" || exit 1
22
sha256sum -c "${1}/packaging/libbpf.checksums" || exit 1