Backports for 6.11 verifier errors (#1961)

stackrox · Nov 19, 2024 · e8c795e · e8c795e
1 parent 71097f8
commit e8c795e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -64,3 +64,7 @@
 	path = builder/third_party/yaml-cpp
 	url = https://github.com/jbeder/yaml-cpp.git
 	branch = master
+[submodule "builder/third_party/bpftool"]
+	path = builder/third_party/bpftool
+	url = https://github.com/libbpf/bpftool
+	branch = v7.3.0
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -12,6 +12,7 @@ RUN dnf -y update \
         bison \
         ca-certificates \
         clang-17.0.6 \
+        llvm-17.0.6 \
         cmake \
         cracklib-dicts \
         diffutils \
@@ -42,7 +43,6 @@ RUN dnf -y update \
         valgrind \
         wget \
         which \
-        bpftool \
         # for USDT support
         systemtap-sdt-devel \
     && dnf clean all

diff --git a/builder/install/90-bpftool.sh b/builder/install/90-bpftool.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd third_party/bpftool
+
+# Replace libbpf with our submodule
+rm -rf libbpf/
+ln -s ../libbpf libbpf
+
+mkdir src/build
+make V=1 -C src ${NPROCS:+-j ${NPROCS}} all install
diff --git a/builder/third_party/bpftool b/builder/third_party/bpftool
diff --git a/collector/container/konflux.Dockerfile b/collector/container/konflux.Dockerfile
@@ -19,7 +19,7 @@ RUN /tmp/.konflux/scripts/subscription-manager-bro.sh register /mnt && \
         wget \
         unzip \
         clang \
-        bpftool \
+        llvm \
         cmake-3.18.2-9.el8 \
         gcc-c++ \
         openssl-devel \

diff --git a/falcosecurity-libs b/falcosecurity-libs