From 7d0fc89a87a43c62516483338ccbd38285c1f7bc Mon Sep 17 00:00:00 2001 From: Anastasios Papagiannis Date: Fri, 28 Jun 2024 13:14:35 +0000 Subject: [PATCH] Fix libbpf submodule checkout in bpftool [upstream commit 0235ed57252b9e03c68ea1dbc6ad0b1b6b5e6298] Now in the Dockerfile we do: git clone --recurse-submodules https://github.com/libbpf/bpftool.git . && git checkout ${BPFTOOL_REV} which means that we fetch the libbpf submodule version of the main branch of bpftool and then we move to the appropriate commit that we need. After the checkout we also need to fetch the correct version of the submodules. This patch fixes that. Signed-off-by: Anastasios Papagiannis --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4785d0497b..64526bb8657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ RUN if [ $BUILDARCH != $TARGETARCH ]; \ else apt-get install -y curl git llvm gcc pkg-config zlib1g-dev libelf-dev libcap-dev; fi # v7.3.0 ENV BPFTOOL_REV "687e7f06f2ee104ed6515ec3a9816af77bfa7a17" -RUN git clone --recurse-submodules https://github.com/libbpf/bpftool.git . && git checkout ${BPFTOOL_REV} +RUN git clone https://github.com/libbpf/bpftool.git . && git checkout ${BPFTOOL_REV} && git submodule update --init --recursive RUN if [ $BUILDARCH != $TARGETARCH ]; \ then make -C src EXTRA_CFLAGS=--static CC=aarch64-linux-gnu-gcc -j $(nproc) && aarch64-linux-gnu-strip src/bpftool; \ else make -C src EXTRA_CFLAGS=--static -j $(nproc) && strip src/bpftool; fi