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

11 files changed, 20 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
index bc1bb00fbd..2dfc5dea86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,9 +89,6 @@ packaging/installer/.environment.sh
 # netdata makeself downloads
 packaging/makeself/tmp/
 
-# Libbpf is always overwritten depending of kernel version
-packaging/libbpf.*
-
 # coverity
 cov-int/
 netdata-coverity-analysis.tgz
diff --git a/Makefile.am b/Makefile.am
index e7ac3e6403..f91bc6b981 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,8 +76,10 @@ dist_noinst_DATA = \
     packaging/jsonc.version \
     packaging/yaml.checksums \
     packaging/yaml.version \
-    packaging/libbpf.checksums \
-    packaging/libbpf.version \
+    packaging/current_libbpf.checksums \
+    packaging/current_libbpf.version \
+    packaging/libbpf_0_0_9.checksums \
+    packaging/libbpf_0_0_9.version \
     packaging/protobuf.checksums \
     packaging/protobuf.version \
     packaging/version \
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}" \
diff --git a/packaging/current_libbpf.checksums b/packaging/current_libbpf.checksums
index e0b91c0c6d..2f0d8a9b83 100644
--- a/packaging/current_libbpf.checksums
+++ b/packaging/current_libbpf.checksums
@@ -1 +1 @@
-f2a8214c967153fcbb7a8f2af59c23a38f6e175384878dd37648649c5d8182c4  v1.1_netdata.tar.gz
+97d0b6d5b86ae473883aadcba4fcecf47f608f5d0eb3dbb75eb2dbde271f0046  v1.2_netdata.tar.gz
diff --git a/packaging/current_libbpf.version b/packaging/current_libbpf.version
index b0797d5a86..eff71eefba 100644
--- a/packaging/current_libbpf.version
+++ b/packaging/current_libbpf.version
@@ -1 +1 @@
-1.1_netdata
+1.2_netdata
diff --git a/packaging/ebpf-co-re.checksums b/packaging/ebpf-co-re.checksums
index 813e421cc7..4d4f585d7d 100644
--- a/packaging/ebpf-co-re.checksums
+++ b/packaging/ebpf-co-re.checksums
@@ -1 +1 @@
-a50e649635cc2fe86c21a08334ee73451f08591ebbda8b5d0012c3b8fad2cc1e  netdata-ebpf-co-re-glibc-v1.1.2.tar.xz
+2bcbe98689efe6ee364cb3e9161ef549198d7f181845add923c6561bc8fb74d1  netdata-ebpf-co-re-glibc-v1.2.0.tar.xz
diff --git a/packaging/ebpf-co-re.version b/packaging/ebpf-co-re.version
index 0f1acbd565..79127d85a4 100644
--- a/packaging/ebpf-co-re.version
+++ b/packaging/ebpf-co-re.version
@@ -1 +1 @@
-v1.1.2
+v1.2.0
diff --git a/packaging/ebpf.checksums b/packaging/ebpf.checksums
index 0d0be4eabb..739cc2f3f6 100644
--- a/packaging/ebpf.checksums
+++ b/packaging/ebpf.checksums
@@ -1,3 +1,3 @@
-597a20895bbedcf87528b08fa9057426bd3c7638aa1ffac94f8987a90634513d  ./netdata-kernel-collector-glibc-v1.1.2.tar.xz
-25db2232b75bdb7fc6e10db870c3a3290f52ecfcdcf546d0e51947f2a4c17ccf  ./netdata-kernel-collector-musl-v1.1.2.tar.xz
-1d60425f5e8c6e30b3be86028dfc62c16022d8fe561e4c21c84cf6e8b998cd7d  ./netdata-kernel-collector-static-v1.1.2.tar.xz
+a7386ffca8cbe9aa24c01b0b97b2e3553c11d696752037551277f9b1f5feb100  ./netdata-kernel-collector-glibc-v1.2.0.tar.xz
+2b37ce6129dc61fd79e5519c150196099d363b4e57dafc55b210f64f9b40a3ec  ./netdata-kernel-collector-musl-v1.2.0.tar.xz
+ad22f11cb545557c09955f3728ba76d9734345c0ab84927086bb0e99a9f88f80  ./netdata-kernel-collector-static-v1.2.0.tar.xz
diff --git a/packaging/ebpf.version b/packaging/ebpf.version
index 0f1acbd565..79127d85a4 100644
--- a/packaging/ebpf.version
+++ b/packaging/ebpf.version
@@ -1 +1 @@
-v1.1.2
+v1.2.0
diff --git a/packaging/libbpf.checksums b/packaging/libbpf.checksums
deleted file mode 100644
index e0b91c0c6d..0000000000
--- a/packaging/libbpf.checksums
+++ /dev/null
@@ -1 +0,0 @@
-f2a8214c967153fcbb7a8f2af59c23a38f6e175384878dd37648649c5d8182c4  v1.1_netdata.tar.gz
diff --git a/packaging/libbpf.version b/packaging/libbpf.version
deleted file mode 100644
index b0797d5a86..0000000000
--- a/packaging/libbpf.version
+++ /dev/null
@@ -1 +0,0 @@
-1.1_netdata