From 1a08508203806ad5b0068feb6b7137ab2c779513 Mon Sep 17 00:00:00 2001
From: Laura Nao <laura.nao@collabora.com>
Date: Mon, 16 Dec 2024 15:27:20 +0100
Subject: [PATCH] config: docker: Update pahole to v1.28

A recent regression[1] has been identified, and it does not occur with
pahole v1.28. Update pahole to the appropriate version in the Docker
containers used for kernel builds.

[1] https://lore.kernel.org/all/20241106160820.259829-1-laura.nao@collabora.com/

Signed-off-by: Laura Nao <laura.nao@collabora.com>
---
 config/docker/base/host-tools.jinja2 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/config/docker/base/host-tools.jinja2 b/config/docker/base/host-tools.jinja2
index 4d4c5a4e59..b0d2aa2779 100644
--- a/config/docker/base/host-tools.jinja2
+++ b/config/docker/base/host-tools.jinja2
@@ -62,8 +62,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     bison \
     bsdmainutils \
     ccache \
+    cmake \
     cpio \
     dwarves \
+    elfutils \
     flex \
     g++ \
     gawk \
@@ -72,6 +74,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     kmod \
     libssl-dev \
     libelf-dev \
+    libdw-dev \
     lz4 \
     lzop \
     make \
@@ -89,4 +92,16 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 # Install dtschema for dtbs_check
 RUN pip3 install dtschema --break-system-packages
 
+# Clone and build pahole v1.28
+RUN git clone https://git.kernel.org/pub/scm/devel/pahole/pahole.git && \
+    cd pahole && \
+    git checkout v1.28 && \
+    mkdir build && cd build && \
+    cmake .. && \
+    make && \
+    make install && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/dwarves.conf && \
+    ldconfig && \
+    cd ../.. && rm -rf pahole
+
 {% endblock %}