cilium · lmb · Jul 19, 2022 · Jul 19, 2022
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,8 @@ COPY bullseye-backports.list /etc/apt/sources.list.d
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
 	gcc g++ make git libssl-dev bison flex libelf-dev libssl-dev libc-dev libc6-dev-i386 libcap-dev bc \
-	tar xz-utils curl ca-certificates python3-pip python3-setuptools python3-docutils pahole/bullseye-backports rsync \
+	tar xz-utils curl ca-certificates python3-pip python3-setuptools python3-docutils rsync \
+	cmake libdw-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
 # The LLVM repos need ca-certificates to be present.
@@ -19,6 +20,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
 
 RUN pip3 install https://github.com/amluto/virtme/archive/refs/heads/master.zip
 
+ENV PAHOLE_TAG=v1.23
+COPY pahole.sh /pahole.sh
+RUN /pahole.sh ${PAHOLE_TAG} && rm /pahole.sh
+
 VOLUME /work
 
 CMD ["/work/make.sh"]
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1657105395
+1658247218
diff --git a/linux-4.14-selftests-bpf.tgz b/linux-4.14-selftests-bpf.tgz
diff --git a/linux-4.14.282-selftests-bpf.tgz b/linux-4.14.282-selftests-bpf.tgz
diff --git a/linux-4.14.282.bz b/linux-4.14.282.bz
diff --git a/linux-4.14.bz b/linux-4.14.bz
diff --git a/linux-4.19-selftests-bpf.tgz b/linux-4.19-selftests-bpf.tgz
diff --git a/linux-4.19.246-selftests-bpf.tgz b/linux-4.19.246-selftests-bpf.tgz
diff --git a/linux-4.19.246.bz b/linux-4.19.246.bz
diff --git a/linux-4.19.bz b/linux-4.19.bz
diff --git a/linux-4.9.317.bz b/linux-4.9.317.bz
diff --git a/linux-4.9.bz b/linux-4.9.bz
diff --git a/linux-5.10-selftests-bpf.tgz b/linux-5.10-selftests-bpf.tgz
diff --git a/linux-5.10.76-selftests-bpf.tgz b/linux-5.10.76-selftests-bpf.tgz
diff --git a/linux-5.10.76.bz b/linux-5.10.76.bz
diff --git a/linux-5.10.bz b/linux-5.10.bz
diff --git a/linux-5.15-selftests-bpf.tgz b/linux-5.15-selftests-bpf.tgz
diff --git a/linux-5.15.19-selftests-bpf.tgz b/linux-5.15.19-selftests-bpf.tgz
diff --git a/linux-5.15.19.bz b/linux-5.15.19.bz
diff --git a/linux-5.15.bz b/linux-5.15.bz
diff --git a/linux-5.18-selftests-bpf.tgz b/linux-5.18-selftests-bpf.tgz
diff --git a/linux-5.18.10-selftests-bpf.tgz b/linux-5.18.10-selftests-bpf.tgz
diff --git a/linux-5.18.10.bz b/linux-5.18.10.bz
diff --git a/linux-5.18.bz b/linux-5.18.bz
diff --git a/linux-5.4-selftests-bpf.tgz b/linux-5.4-selftests-bpf.tgz
diff --git a/linux-5.4.197-selftests-bpf.tgz b/linux-5.4.197-selftests-bpf.tgz
diff --git a/linux-5.4.197.bz b/linux-5.4.197.bz
diff --git a/linux-5.4.bz b/linux-5.4.bz
diff --git a/pahole.sh b/pahole.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# A script to install pahole from source.
+
+set -eu
+
+tmp="$(mktemp -d)"
+trap 'rm -rf "$tmp"' EXIT
+readonly tmp
+
+cd "$tmp"
+git clone --recurse-submodules --branch "$1" --single-branch https://git.kernel.org/pub/scm/devel/pahole/pahole.git pahole
+mkdir pahole/build
+cd pahole/build
+cmake -D__LIB=lib ..
+make install
+ldconfig