With pre-generated vmlinux.h there is no dependency on neither vmlinux
nor bootstrap bpftool. Define dependencies separately for both modes.
This avoids needless rebuilds in some corner cases.
Suggested-by: Jan Stancek <[email protected]>
Signed-off-by: Artem Savkov <[email protected]>
---
tools/bpf/bpftool/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index dfa4f1bebbb31..ba927379eb201 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -204,10 +204,11 @@ ifeq ($(feature-clang-bpf-co-re),1)
BUILD_BPF_SKELS := 1
-$(OUTPUT)vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL_BOOTSTRAP)
ifeq ($(VMLINUX_H),)
+$(OUTPUT)vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL_BOOTSTRAP)
$(QUIET_GEN)$(BPFTOOL_BOOTSTRAP) btf dump file $< format c > $@
else
+$(OUTPUT)vmlinux.h: $(VMLINUX_H)
$(Q)cp "$(VMLINUX_H)" $@
endif
--
2.44.0
2024-05-13 12:27 UTC+0100 ~ Artem Savkov <[email protected]>
> With pre-generated vmlinux.h there is no dependency on neither vmlinux
> nor bootstrap bpftool. Define dependencies separately for both modes.
> This avoids needless rebuilds in some corner cases.
>
> Suggested-by: Jan Stancek <[email protected]>
> Signed-off-by: Artem Savkov <[email protected]>
Looks good, thank you.
Acked-by: Quentin Monnet <[email protected]>
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <[email protected]>:
On Mon, 13 May 2024 13:26:58 +0200 you wrote:
> With pre-generated vmlinux.h there is no dependency on neither vmlinux
> nor bootstrap bpftool. Define dependencies separately for both modes.
> This avoids needless rebuilds in some corner cases.
>
> Suggested-by: Jan Stancek <[email protected]>
> Signed-off-by: Artem Savkov <[email protected]>
>
> [...]
Here is the summary with links:
- [bpf-next] bpftool: fix make dependencies for vmlinux.h
https://git.kernel.org/bpf/bpf-next/c/83eea61776c9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html