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
thiagoftsm committed
Jun 7, 2023 at 07:54 UTC
5de5b6531331e6ca59948f6465e26851843651d0
11 files changed
+20
-30
.gitignore
-3
@@ -89,9 +89,6 @@ packaging/installer/.environment.sh
89
# netdata makeself downloads
90
packaging/makeself/tmp/
91
92
-# Libbpf is always overwritten depending of kernel version
93
-packaging/libbpf.*
94
-
92
# coverity
93
cov-int/
94
netdata-coverity-analysis.tgz
Makefile.am
+4
-2
@@ -76,8 +76,10 @@ dist_noinst_DATA = \
76
packaging/jsonc.version \
77
packaging/yaml.checksums \
78
packaging/yaml.version \
79
- packaging/libbpf.checksums \
80
- packaging/libbpf.version \
79
+ packaging/current_libbpf.checksums \
80
+ packaging/current_libbpf.version \
81
+ packaging/libbpf_0_0_9.checksums \
82
+ packaging/libbpf_0_0_9.version \
83
packaging/protobuf.checksums \
84
packaging/protobuf.version \
85
packaging/version \
netdata-installer.sh
+8
-15
@@ -816,17 +816,6 @@ detect_libc() {
816
return 0
817
}
818
819
-rename_libbpf_packaging() {
820
- if [ "$(get_kernel_version)" -ge "004014000" ]; then
821
- cp packaging/current_libbpf.checksums packaging/libbpf.checksums
822
- cp packaging/current_libbpf.version packaging/libbpf.version
823
- else
824
- cp packaging/libbpf_0_0_9.checksums packaging/libbpf.checksums
825
- cp packaging/libbpf_0_0_9.version packaging/libbpf.version
826
- fi
827
-}
828
-
829
-
819
build_libbpf() {
820
cd "${1}/src" > /dev/null || return 1
821
mkdir root build
@@ -866,16 +855,20 @@ bundle_libbpf() {
855
856
[ -n "${GITHUB_ACTIONS}" ] && echo "::group::Bundling libbpf."
857
869
- rename_libbpf_packaging
870
-
858
progress "Prepare libbpf"
859
873
- LIBBPF_PACKAGE_VERSION="$(cat packaging/libbpf.version)"
860
+ if [ "$(get_kernel_version)" -ge "004014000" ]; then
861
+ LIBBPF_PACKAGE_VERSION="$(cat packaging/current_libbpf.version)"
862
+ LIBBPF_PACKAGE_COMPONENT="current_libbpf"
863
+ else
864
+ LIBBPF_PACKAGE_VERSION="$(cat packaging/libbpf_0_0_9.version)"
865
+ LIBBPF_PACKAGE_COMPONENT="libbpf_0_0_9"
866
+ fi
867
868
tmp="$(mktemp -d -t netdata-libbpf-XXXXXX)"
869
LIBBPF_PACKAGE_BASENAME="v${LIBBPF_PACKAGE_VERSION}.tar.gz"
870
878
- if fetch_and_verify "libbpf" \
871
+ if fetch_and_verify "${LIBBPF_PACKAGE_COMPONENT}" \
872
"https://github.com/netdata/libbpf/archive/${LIBBPF_PACKAGE_BASENAME}" \
873
"${LIBBPF_PACKAGE_BASENAME}" \
874
"${tmp}" \
packaging/current_libbpf.checksums
+1
-1
@@ -1 +1 @@
1
-f2a8214c967153fcbb7a8f2af59c23a38f6e175384878dd37648649c5d8182c4 v1.1_netdata.tar.gz
1
+97d0b6d5b86ae473883aadcba4fcecf47f608f5d0eb3dbb75eb2dbde271f0046 v1.2_netdata.tar.gz
packaging/current_libbpf.version
+1
-1
@@ -1 +1 @@
1
-1.1_netdata
1
+1.2_netdata
packaging/ebpf-co-re.checksums
+1
-1
@@ -1 +1 @@
1
-a50e649635cc2fe86c21a08334ee73451f08591ebbda8b5d0012c3b8fad2cc1e netdata-ebpf-co-re-glibc-v1.1.2.tar.xz
1
+2bcbe98689efe6ee364cb3e9161ef549198d7f181845add923c6561bc8fb74d1 netdata-ebpf-co-re-glibc-v1.2.0.tar.xz
packaging/ebpf-co-re.version
+1
-1
@@ -1 +1 @@
1
-v1.1.2
1
+v1.2.0
packaging/ebpf.checksums
+3
-3
@@ -1,3 +1,3 @@
1
-597a20895bbedcf87528b08fa9057426bd3c7638aa1ffac94f8987a90634513d ./netdata-kernel-collector-glibc-v1.1.2.tar.xz
2
-25db2232b75bdb7fc6e10db870c3a3290f52ecfcdcf546d0e51947f2a4c17ccf ./netdata-kernel-collector-musl-v1.1.2.tar.xz
3
-1d60425f5e8c6e30b3be86028dfc62c16022d8fe561e4c21c84cf6e8b998cd7d ./netdata-kernel-collector-static-v1.1.2.tar.xz
1
+a7386ffca8cbe9aa24c01b0b97b2e3553c11d696752037551277f9b1f5feb100 ./netdata-kernel-collector-glibc-v1.2.0.tar.xz
2
+2b37ce6129dc61fd79e5519c150196099d363b4e57dafc55b210f64f9b40a3ec ./netdata-kernel-collector-musl-v1.2.0.tar.xz
3
+ad22f11cb545557c09955f3728ba76d9734345c0ab84927086bb0e99a9f88f80 ./netdata-kernel-collector-static-v1.2.0.tar.xz
packaging/ebpf.version
+1
-1
@@ -1 +1 @@
1
-v1.1.2
1
+v1.2.0
packaging/libbpf.checksums
deleted
-1
@@ -1 +0,0 @@
1
-f2a8214c967153fcbb7a8f2af59c23a38f6e175384878dd37648649c5d8182c4 v1.1_netdata.tar.gz
packaging/libbpf.version
deleted
-1
@@ -1 +0,0 @@
1
-1.1_netdata