[PATCH bpf-next] selftests/bpf: Add RESOLVE_BTFIDS dependency to bpf_testmod.ko

[PATCH bpf-next] selftests/bpf: Add RESOLVE_BTFIDS dependency to bpf_testmod.ko

[Ilya Leoshkevich]

bpf_testmod.ko sometimes fails to build from a clean checkout:

    BTF [M] linux/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.ko
    /bin/sh: 1: linux-build//tools/build/resolve_btfids/resolve_btfids: not found

The reason is that RESOLVE_BTFIDS may not yet be built. Fix by adding a
dependency.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
 tools/testing/selftests/bpf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 4a8ef118fd9d..febd1dae6c88 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -201,7 +201,7 @@ $(OUTPUT)/sign-file: ../../../../scripts/sign-file.c
 		  $< -o $@ \
 		  $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
 
-$(OUTPUT)/bpf_testmod.ko: $(VMLINUX_BTF) $(wildcard bpf_testmod/Makefile bpf_testmod/*.[ch])
+$(OUTPUT)/bpf_testmod.ko: $(VMLINUX_BTF) $(RESOLVE_BTFIDS) $(wildcard bpf_testmod/Makefile bpf_testmod/*.[ch])
 	$(call msg,MOD,,$@)
 	$(Q)$(RM) bpf_testmod/bpf_testmod.ko # force re-compilation
 	$(Q)$(MAKE) $(submake_extras) RESOLVE_BTFIDS=$(RESOLVE_BTFIDS) -C bpf_testmod
-- 
2.39.2

Re: [PATCH bpf-next] selftests/bpf: Add RESOLVE_BTFIDS dependency to bpf_testmod.ko

[Jiri Olsa]

On Mon, Apr 03, 2023 at 07:29:35PM +0200, Ilya Leoshkevich wrote:
> bpf_testmod.ko sometimes fails to build from a clean checkout:
> 
>     BTF [M] linux/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.ko
>     /bin/sh: 1: linux-build//tools/build/resolve_btfids/resolve_btfids: not found
> 
> The reason is that RESOLVE_BTFIDS may not yet be built. Fix by adding a
> dependency.
> 
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

jirka

> ---
>  tools/testing/selftests/bpf/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 4a8ef118fd9d..febd1dae6c88 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -201,7 +201,7 @@ $(OUTPUT)/sign-file: ../../../../scripts/sign-file.c
>  		  $< -o $@ \
>  		  $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
>  
> -$(OUTPUT)/bpf_testmod.ko: $(VMLINUX_BTF) $(wildcard bpf_testmod/Makefile bpf_testmod/*.[ch])
> +$(OUTPUT)/bpf_testmod.ko: $(VMLINUX_BTF) $(RESOLVE_BTFIDS) $(wildcard bpf_testmod/Makefile bpf_testmod/*.[ch])
>  	$(call msg,MOD,,$@)
>  	$(Q)$(RM) bpf_testmod/bpf_testmod.ko # force re-compilation
>  	$(Q)$(MAKE) $(submake_extras) RESOLVE_BTFIDS=$(RESOLVE_BTFIDS) -C bpf_testmod
> -- 
> 2.39.2
> 

Re: [PATCH bpf-next] selftests/bpf: Add RESOLVE_BTFIDS dependency to bpf_testmod.ko

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Mon,  3 Apr 2023 19:29:35 +0200 you wrote:
> bpf_testmod.ko sometimes fails to build from a clean checkout:
> 
>     BTF [M] linux/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.ko
>     /bin/sh: 1: linux-build//tools/build/resolve_btfids/resolve_btfids: not found
> 
> The reason is that RESOLVE_BTFIDS may not yet be built. Fix by adding a
> dependency.
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: Add RESOLVE_BTFIDS dependency to bpf_testmod.ko
    https://git.kernel.org/bpf/bpf-next/c/8fc59c26d212

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html