From f3a730de3b3bd18ba17fd91e539a4b4777deef72 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 27 Jan 2025 21:33:46 +0200 Subject: [PATCH] in kernel-bcc, automatically determine python path Signed-off-by: Avi Deitcher --- kernel/Dockerfile.bcc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 9107da013..efe097dfe 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -39,9 +39,6 @@ RUN apk update && apk upgrade -a && \ 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 @@ -77,8 +74,9 @@ 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/ -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 PYTHONPATH=$(python3 -c "import sysconfig; print(sysconfig.get_path('stdlib'))") && mkdir -p /out${PYTHONPATH} && \ + cp -a ${PYTHONPATH}/site-packages /out/${PYTHONPATH} RUN mkdir -p /out/usr/share && \ cp -a /usr/share/bcc /out/usr/share/ RUN mkdir -p /out/usr/bin && \