archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-05-09 03:20:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix libbpf handling in RPM builds. ()

Browse source
This commit is contained in:
Austin S. Hemmelgarn 2021-10-22 07:26:26 -04:00 • committed by GitHub
parent aa0255b75f
commit e79fe3fb8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions

10
netdata.spec.in
View file

@ -235,7 +235,15 @@ export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-judy.sh ${RPM_BUILD_DIR}/%{name}-%{version} export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-judy.sh ${RPM_BUILD_DIR}/%{name}-%{version}
%endif %endif
%if 0%{?_have_ebpf} %if 0%{?_have_ebpf}
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} %if 0%{?centos_ver:1}
%if %{centos_ver} < 8
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} centos7
%else
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} centos8
%endif
%else
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} other
%endif
%endif %endif
%build %build

16
packaging/bundle-libbpf.sh
View file

@ -1,7 +1,4 @@
#!/bin/sh #!/bin/bash
LIBBPF_TARBALL="v$(cat "${1}/packaging/libbpf.version").tar.gz"
LIBBPF_BUILD_PATH="${1}/externaldeps/libbpf/libbpf-$(cat "${1}/packaging/libbpf.version")"
if [ "$(uname -m)" = x86_64 ]; then if [ "$(uname -m)" = x86_64 ]; then
lib_subdir="lib64" lib_subdir="lib64"
@ -9,6 +6,17 @@ else
lib_subdir="lib" lib_subdir="lib"
fi fi
if [ "${2}" != "centos7" ]; then
cp "${1}/packaging/current_libbpf.checksums" "${1}/packaging/libbpf.checksums"
cp "${1}/packaging/current_libbpf.version" "${1}/packaging/libbpf.version"
else
cp "${1}/packaging/libbpf_0_0_9.checksums" "${1}/packaging/libbpf.checksums"
cp "${1}/packaging/libbpf_0_0_9.version" "${1}/packaging/libbpf.version"
fi
LIBBPF_TARBALL="v$(cat "${1}/packaging/libbpf.version").tar.gz"
LIBBPF_BUILD_PATH="${1}/externaldeps/libbpf/libbpf-$(cat "${1}/packaging/libbpf.version")"
mkdir -p "${1}/externaldeps/libbpf" || exit 1 mkdir -p "${1}/externaldeps/libbpf" || exit 1
curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/libbpf/archive/${LIBBPF_TARBALL}" > "${LIBBPF_TARBALL}" || exit 1 curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/libbpf/archive/${LIBBPF_TARBALL}" > "${LIBBPF_TARBALL}" || exit 1
sha256sum -c "${1}/packaging/libbpf.checksums" || exit 1 sha256sum -c "${1}/packaging/libbpf.checksums" || exit 1