From 18fda61ca3312c2f7a19e2aa508f52d7ea5369ee Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Wed, 24 Aug 2022 11:19:49 +0800 Subject: [PATCH] bpf: Fix cold build of test_progs-no_alu32 mainline inclusion from mainline-5.11-rc1 commit 58c185b85d0c1753b0b6a9390294bd883faf4d77 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=58c185b85d0c1753b0b6a9390294bd883faf4d77 ------------------------------------------------- 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 Signed-off-by: Andrii Nakryiko Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20201203120850.859170-1-jackmanb@google.com (cherry picked from commit 58c185b85d0c1753b0b6a9390294bd883faf4d77) Signed-off-by: Wang Yufen --- 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 080d9796e8e3..cceea641ace0 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -385,7 +385,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 -- GitLab