diff options
| author | thiagoftsm <thiagoftsm@gmail.com> | 2023-06-07 07:54:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 10:54:37 +0300 |
| commit | 5de5b6531331e6ca59948f6465e26851843651d0 (patch) | |
| tree | c380b44b294875cc3916933774a920b4976d36b4 /netdata-installer.sh | |
| parent | e3c866e3b6bdd5bcb766138ebddb3a6f7c8a511d (diff) | |
Update libbpf (#15038)
* update_libbpf_1_2: Update libbpf version
* update_libbpf_1_2: Update kernel-collector version
* update_libbpf_1_2: Update ebpf-co-re
* update_libbpf_1_2: Remove libbpf.* from .gitignore
* update_libbpf_1_2: Remove libbpf.* files and keep only other two avoiding rewrite during installation
* update_libbpf_1_2: Remove plugin from other branch
Diffstat (limited to 'netdata-installer.sh')
| -rwxr-xr-x | netdata-installer.sh | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh index 950901b024..c6272647fd 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -816,17 +816,6 @@ detect_libc() { return 0 } -rename_libbpf_packaging() { - if [ "$(get_kernel_version)" -ge "004014000" ]; then - cp packaging/current_libbpf.checksums packaging/libbpf.checksums - cp packaging/current_libbpf.version packaging/libbpf.version - else - cp packaging/libbpf_0_0_9.checksums packaging/libbpf.checksums - cp packaging/libbpf_0_0_9.version packaging/libbpf.version - fi -} - - build_libbpf() { cd "${1}/src" > /dev/null || return 1 mkdir root build @@ -866,16 +855,20 @@ bundle_libbpf() { [ -n "${GITHUB_ACTIONS}" ] && echo "::group::Bundling libbpf." - rename_libbpf_packaging - progress "Prepare libbpf" - LIBBPF_PACKAGE_VERSION="$(cat packaging/libbpf.version)" + if [ "$(get_kernel_version)" -ge "004014000" ]; then + LIBBPF_PACKAGE_VERSION="$(cat packaging/current_libbpf.version)" + LIBBPF_PACKAGE_COMPONENT="current_libbpf" + else + LIBBPF_PACKAGE_VERSION="$(cat packaging/libbpf_0_0_9.version)" + LIBBPF_PACKAGE_COMPONENT="libbpf_0_0_9" + fi tmp="$(mktemp -d -t netdata-libbpf-XXXXXX)" LIBBPF_PACKAGE_BASENAME="v${LIBBPF_PACKAGE_VERSION}.tar.gz" - if fetch_and_verify "libbpf" \ + if fetch_and_verify "${LIBBPF_PACKAGE_COMPONENT}" \ "https://github.com/netdata/libbpf/archive/${LIBBPF_PACKAGE_BASENAME}" \ "${LIBBPF_PACKAGE_BASENAME}" \ "${tmp}" \ |