From 480ff67ddc85aaf9a29dc46451cc3038c5bfa837 Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Thu, 25 Jan 2024 19:39:04 +0200
Subject: [PATCH] update bcc version

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 kernel/Dockerfile.bcc  | 18 ++++++++++++------
 kernel/Dockerfile.perf |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc
index 755f5863f..a2129910b 100644
--- a/kernel/Dockerfile.bcc
+++ b/kernel/Dockerfile.bcc
@@ -26,20 +26,27 @@ RUN apk update && apk upgrade -a && \
   llvm \
   llvm-dev \
   llvm-static \
+  llvm17-gtest \
   luajit-dev \
   m4 \
   musl-fts-dev \
   python3 \
+  py3-pip \
+  xz \
+  zip \
   zlib-dev \
   && true
 
+# this is just here to make later copies easier; do not forget to change this if the python version updates
+ENV PYTHON_VERSION=3.11
+
 RUN ln -s /usr/lib/cmake/llvm10/ /usr/lib/cmake/llvm && \
     ln -s /usr/include/llvm10/llvm-c/ /usr/include/llvm-c && \
     ln -s /usr/include/llvm10/llvm/ /usr/include/llvm
 
 WORKDIR /build
 
-ENV BCC_COMMIT=14278bf1a52dd76ff66eed02cc9db7c7ec240da6
+ENV BCC_COMMIT=v0.29.1
 RUN git clone https://github.com/iovisor/bcc.git && \
     cd bcc && \
     git checkout $BCC_COMMIT && \
@@ -67,10 +74,9 @@ RUN mkdir -p /out/usr/ && \
 RUN mkdir -p /out/usr/lib && \
     cp -a /usr/lib/libelf* /out/usr/lib/ && \
     cp -a /usr/lib/libstdc* /out/usr/lib/ && \
-    cp -a /usr/lib/libintl* /out/usr/lib/ && \
-    cp -a /usr/lib64/* /out/usr/lib/
-RUN mkdir -p /out/usr/lib/python3.8 && \
-    cp -a /usr/lib/python3.8/site-packages /out/usr/lib/python3.8/
+    cp -a /usr/lib/libintl* /out/usr/lib/
+RUN mkdir -p /out/usr/lib/python${PYTHON_VERSION} && \
+    cp -a /usr/lib/python${PYTHON_VERSION}/site-packages /out/usr/lib/python${PYTHON_VERSION}/
 RUN mkdir -p /out/usr/share && \
     cp -a /usr/share/bcc /out/usr/share/
 RUN mkdir -p /out/usr/bin && \
@@ -90,6 +96,6 @@ FROM scratch
 ENTRYPOINT []
 CMD []
 WORKDIR /
-ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib64
+ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 COPY --from=mirror /out /
 COPY --from=build /out /
diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf
index ec906ee89..2580bcedf 100644
--- a/kernel/Dockerfile.perf
+++ b/kernel/Dockerfile.perf
@@ -24,6 +24,7 @@ RUN apk add \
     mpc1-dev \
     mpfr-dev \
     python3 \
+    python3-dev \
     sed \
     tar \
     xz \