From 769ae956e5a36ebe42ab4e9b5b10000f86620302 Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Wed, 3 Apr 2024 10:28:22 +0100 Subject: [PATCH] images/bpftool: Update bpftool image We want our bpftool image to support dumping netkit programs, with kernel commit bec981a4add6 ("bpftool: Extend net dump with netkit progs"). Let's update to a recent version: v7.4.0 was tagged yesterday, let's use the corresponding kernel commit. Signed-off-by: Quentin Monnet --- images/bpftool/checkout-linux.sh | 3 ++- images/bpftool/test/spec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/bpftool/checkout-linux.sh b/images/bpftool/checkout-linux.sh index 498112eb..630b7cd1 100755 --- a/images/bpftool/checkout-linux.sh +++ b/images/bpftool/checkout-linux.sh @@ -8,7 +8,8 @@ set -o errexit set -o pipefail set -o nounset -rev="93270357daa949e4bed375b40d0a100ce04f3399" +# bpftool v7.4.0 +rev="14bb1e8c8d4ad5d9d2febb7d19c70a3cf536e1e5" # git clone git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git /src/linux # cd /src/linux diff --git a/images/bpftool/test/spec.yaml b/images/bpftool/test/spec.yaml index 943ae9dc..6ac3521c 100644 --- a/images/bpftool/test/spec.yaml +++ b/images/bpftool/test/spec.yaml @@ -15,4 +15,4 @@ commandTests: command: "bpftool" args: ["version"] expectedOutput: - - 'bpftool\ v7\.0\.0' + - 'bpftool\ v7\.4\.0'