[PATCH bpf-next] bpf: Fix cold build of test_progs-no_alu32

[PATCH bpf-next] bpf: Fix cold build of test_progs-no_alu32

[Brendan Jackman]

This object lives inside the trunner output dir,
i.e. tools/testing/selftests/bpf/no_alu32/btf_data.o

At some point it gets copied into the parent directory during another
part of the build, but that doesn't happen when building
test_progs-no_alu32 from clean.

Signed-off-by: Brendan Jackman <jackmanb@google.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 894192c319fb..371b022d932c 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -378,7 +378,7 @@ $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS)			\
 			     | $(TRUNNER_BINARY)-extras
 	$$(call msg,BINARY,,$$@)
 	$(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) -o $$@
-	$(Q)$(RESOLVE_BTFIDS) --no-fail --btf btf_data.o $$@
+	$(Q)$(RESOLVE_BTFIDS) --no-fail --btf $(TRUNNER_OUTPUT)/btf_data.o $$@
 
 endef
 

base-commit: 97306be45fbe7a02461c3c2a57e666cf662b1aaf
-- 
2.29.2.454.gaff20da3a2-goog

Re: [PATCH bpf-next] bpf: Fix cold build of test_progs-no_alu32

[Jiri Olsa]

On Thu, Dec 03, 2020 at 12:08:50PM +0000, Brendan Jackman wrote:
> This object lives inside the trunner output dir,
> i.e. tools/testing/selftests/bpf/no_alu32/btf_data.o
> 
> At some point it gets copied into the parent directory during another
> part of the build, but that doesn't happen when building
> test_progs-no_alu32 from clean.

looks good

Acked-by: Jiri Olsa <jolsa@redhat.com>

thanks,
jirka

> 
> Signed-off-by: Brendan Jackman <jackmanb@google.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 894192c319fb..371b022d932c 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -378,7 +378,7 @@ $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS)			\
>  			     | $(TRUNNER_BINARY)-extras
>  	$$(call msg,BINARY,,$$@)
>  	$(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) -o $$@
> -	$(Q)$(RESOLVE_BTFIDS) --no-fail --btf btf_data.o $$@
> +	$(Q)$(RESOLVE_BTFIDS) --no-fail --btf $(TRUNNER_OUTPUT)/btf_data.o $$@
>  
>  endef
>  
> 
> base-commit: 97306be45fbe7a02461c3c2a57e666cf662b1aaf
> -- 
> 2.29.2.454.gaff20da3a2-goog
> 

Re: [PATCH bpf-next] bpf: Fix cold build of test_progs-no_alu32

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

On Thu,  3 Dec 2020 12:08:50 +0000 you wrote:
> This object lives inside the trunner output dir,
> i.e. tools/testing/selftests/bpf/no_alu32/btf_data.o
> 
> At some point it gets copied into the parent directory during another
> part of the build, but that doesn't happen when building
> test_progs-no_alu32 from clean.
> 
> [...]

Here is the summary with links:
  - [bpf-next] bpf: Fix cold build of test_progs-no_alu32
    https://git.kernel.org/bpf/bpf-next/c/58c185b85d0c

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