Skip to content

Commit 1fd2c69

Browse files
committed
bpftool: Update to 7.7.0
This PR is #472 with a couple additional fixes to account for changes between 7.6.0 and 7.7.0: * It is no longer necessary to patch `LIBS` to add `-lzstd` since libbpf/bpftool@67f1758 * `bpftool` now links against `openssl`: "This comes at the cost of an additional build dependency to OpenSSL's development library." (see https://github.com/libbpf/bpftool/releases/tag/v7.7.0) Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
1 parent 7a13a3a commit 1fd2c69

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

images/bpftool/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ FROM ${TESTER_IMAGE} AS tester
1010
FROM ${COMPILERS_IMAGE} AS builder
1111

1212
# renovate: datasource=github-releases depName=libbpf/bpftool
13-
ARG BPFTOOL_VERSION="v7.6.0"
13+
ARG BPFTOOL_VERSION="v7.7.0"
1414
WORKDIR /bpftool
1515
RUN git clone --recurse-submodules --branch "${BPFTOOL_VERSION}" https://github.com/libbpf/bpftool.git /bpftool
1616

1717
RUN \
18-
# From Ubuntu 24.04 builder image, libzstd must be added at the end of LIBS and LIBS_BOOTSTRAP to compile statically
19-
# See https://github.com/libbpf/bpftool/issues/152
20-
sed -i "s/\(LIBS = \$(LIBBPF) -lelf -lz\)/\1 -lzstd/; s/\(LIBS_BOOTSTRAP = \$(LIBBPF_BOOTSTRAP) -lelf -lz\)/\1 -lzstd/" /bpftool/src/Makefile \
18+
apt update \
19+
&& apt install -y --no-install-recommends libssl-dev \
2120
&& make -C src EXTRA_CFLAGS=--static BPFTOOL_VERSION="${BPFTOOL_VERSION#v}" -j "$(nproc)" \
2221
&& strip /bpftool/src/bpftool \
2322
&& mkdir -p /out/bin \

images/bpftool/test/spec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commandTests:
1616
args: ["version"]
1717
expectedOutput:
1818
# renovate: datasource=github-releases depName=libbpf/bpftool
19-
- 'bpftool v7.6.0'
19+
- 'bpftool v7.7.0'
2020
- name: "bpftool is statically linked"
2121
command: "ldd"
2222
args: ["/usr/local/bin/bpftool"]

0 commit comments

Comments
 (0)