Skip to content

Commit

Permalink
Update Dockerfiles and kernel versions
Browse files Browse the repository at this point in the history
In kernel 6.11 decl tag generation for kfuncs has been added. This
allows users to list all kfuncs built into the kernel via the vmlinux
BTF. This commit updates the versions.json to include kernel 6.11.

The current builder ships with pahole 1.24 which it gets from the
debian repository. This version does not support the new decl tag
generation. This commit updates the builder to build pahole 1.27 from
source.

Signed-off-by: Dylan Reimerink <[email protected]>
  • Loading branch information
dylandreimerink committed Sep 25, 2024
1 parent 2cf24ef commit 8d3efd9
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM ghcr.io/cilium/ci-kernels-builder:1716461563 AS configure-vmlinux
FROM --platform=$BUILDPLATFORM ghcr.io/cilium/ci-kernels-builder:1727287467 AS configure-vmlinux

ARG KERNEL_VERSION

Expand Down
18 changes: 16 additions & 2 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,25 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
ccache \
libelf-dev \
python3-docutils \
pahole \
libcap-dev \
${CLANG} \
llvm-${CLANG_VERSION} \
lld \
kmod \
rsync \
libc6-dev-i386
libc6-dev-i386 \
cmake \
libdw-dev \
git

RUN cd /tmp && \
git clone https://git.kernel.org/pub/scm/devel/pahole/pahole.git && \
cd pahole && \
git checkout v1.27 && \
git submodule update --init --recursive && \
mkdir build && \
cd build && \
cmake -D__LIB=lib -DBUILD_SHARED_LIBS=OFF .. && \
make install && \
cd / && \
rm -rf /tmp/pahole
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1716461563
1727287467
24 changes: 10 additions & 14 deletions versions.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
[
{
"version": "6.9.1",
"static_tag": "stable"
"version": "6.6.52",
"static_tag": "longterm"
},
{
"version": "6.9",
"version": "6.11",
"static_tag": "mainline"
},
{
"version": "6.8.10",
"static_tag": ""
},
{
"version": "6.6.31",
"static_tag": "longterm"
"version": "6.10.11",
"static_tag": "stable"
},
{
"version": "6.1.91",
"version": "6.1.111",
"static_tag": ""
},
{
"version": "5.4.276",
"version": "5.4.284",
"static_tag": ""
},
{
"version": "5.15.159",
"version": "5.15.167",
"static_tag": ""
},
{
"version": "5.10.217",
"version": "5.10.226",
"static_tag": ""
},
{
"version": "4.19.314",
"version": "4.19.322",
"static_tag": ""
}
]

0 comments on commit 8d3efd9

Please sign in to comment.