From 8747d882b0449718115f85386045e04005bf2f9e Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Mon, 6 May 2024 08:43:10 -0400 Subject: [PATCH] Update eBPF code to v1.4.1. (#17591) * Bump libbpf to v1.4.1p_netdata. * Update eBPF CO-RE code to v1.4.1 * Update legacy eBPF code to v1.4.1. --- packaging/cmake/Modules/NetdataEBPFCORE.cmake | 4 ++-- packaging/cmake/Modules/NetdataEBPFLegacy.cmake | 8 ++++---- packaging/cmake/Modules/NetdataLibBPF.cmake | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/cmake/Modules/NetdataEBPFCORE.cmake b/packaging/cmake/Modules/NetdataEBPFCORE.cmake index 19a85408c6aaf6..341de74b55c41c 100644 --- a/packaging/cmake/Modules/NetdataEBPFCORE.cmake +++ b/packaging/cmake/Modules/NetdataEBPFCORE.cmake @@ -11,8 +11,8 @@ set(ebpf-co-re_SOURCE_DIR "${CMAKE_BINARY_DIR}/ebpf-co-re") function(netdata_fetch_ebpf_co_re) ExternalProject_Add( ebpf-co-re - URL https://github.com/netdata/ebpf-co-re/releases/download/v1.4.0/netdata-ebpf-co-re-glibc-v1.4.0.tar.xz - URL_HASH SHA256=e2283d6e78961c18e964666ee3468492a28454c9e60945027516bdd45e3f4395 + URL https://github.com/netdata/ebpf-co-re/releases/download/v1.4.1/netdata-ebpf-co-re-glibc-v1.4.1.tar.xz + URL_HASH SHA256=7fab9afba4f0fa818abae26e0571b2854ba7e80ada8a6aa3c9d1cfbf5d6a738d SOURCE_DIR "${ebpf-co-re_SOURCE_DIR}" CONFIGURE_COMMAND "" BUILD_COMMAND "" diff --git a/packaging/cmake/Modules/NetdataEBPFLegacy.cmake b/packaging/cmake/Modules/NetdataEBPFLegacy.cmake index 328a651a0c4ff3..01cacededdd05d 100644 --- a/packaging/cmake/Modules/NetdataEBPFLegacy.cmake +++ b/packaging/cmake/Modules/NetdataEBPFLegacy.cmake @@ -20,19 +20,19 @@ function(netdata_fetch_legacy_ebpf_code) endif() if(need_static) - set(_hash 302714979470e300b81a64a4ebef9fac1f3488488482cf30c926fa98f73cabc1) + set(_hash 48cff931e6cbd978fe08d1c601496e269df65deb9b9fc2cc0643d35ea2b122e2) set(_libc "static") elseif(_libc STREQUAL "glibc") - set(_hash 7013753ef85c2d3681bdcfdd7544705cdaf5b640b70734ca223f43cc5adcdc53) + set(_hash 9ca3bd038984bba48c87437facf3445153bf455114573b753f90e3f734820e0a) elseif(_libc STREQUAL "musl") - set(_hash b524d1fcbd67c82cdfc9f46d55f67c0c0c0412c3356c85b38c03ce03f6068747) + set(_hash eaa716ea1deccd918ee2793f789da9a1cb1aec3ee3f7a0d27e327eeb8530cebd) else() message(FATAL_ERROR "Could not determine libc implementation, unable to install eBPF legacy code.") endif() ExternalProject_Add( ebpf-code-legacy - URL https://github.com/netdata/kernel-collector/releases/download/v1.4.0/netdata-kernel-collector-${_libc}-v1.4.0.tar.xz + URL https://github.com/netdata/kernel-collector/releases/download/v1.4.1/netdata-kernel-collector-${_libc}-v1.4.1.tar.xz URL_HASH SHA256=${_hash} SOURCE_DIR "${ebpf-legacy_SOURCE_DIR}" CONFIGURE_COMMAND "" diff --git a/packaging/cmake/Modules/NetdataLibBPF.cmake b/packaging/cmake/Modules/NetdataLibBPF.cmake index 4cd5910c3bca91..91bad7186d8cd2 100644 --- a/packaging/cmake/Modules/NetdataLibBPF.cmake +++ b/packaging/cmake/Modules/NetdataLibBPF.cmake @@ -31,7 +31,7 @@ function(netdata_bundle_libbpf) if(USE_LEGACY_LIBBPF) set(_libbpf_tag 673424c56127bb556e64095f41fd60c26f9083ec) # v0.0.9_netdata-1 else() - set(_libbpf_tag b981a3a138e3a30024e4e143d62cff2dc307121e) # v1.4.0p_netdata + set(_libbpf_tag b39b7f426f276dcfa5761f62c58fab88d7edb8e2) # v1.4.1p_netdata endif() if(DEFINED BUILD_SHARED_LIBS)