tools/bpf: build: Make sure resolve_btfids cleans up after itself (1eb832ac) · Commits · 戴 / test

The new resolve_btfids tool did not clean up the feature detection folder on 'make clean', and also was not called properly from the clean rule in tools/make/ folder on its 'make clean'. This lead to stale objects being left around, which could cause feature detection to fail on subsequent builds. Fixes: ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object") Signed-off-by:

Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net> Acked-by:

Jiri Olsa <jolsa@redhat.com> Link: https://lore.kernel.org/bpf/20200901144343.179552-1-toke@redhat.com

tools/bpf/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ FEATURE_TESTS = libbfd disassembler-four-args
		FEATURE_DISPLAY = libbfd disassembler-four-args

		check_feat := 1
		NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean
		NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean
		ifdef MAKECMDGOALS
		ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),)
		check_feat := 0
		@@ -89,7 +89,7 @@ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c
		$(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c
		$(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c

		clean: bpftool_clean runqslower_clean
		clean: bpftool_clean runqslower_clean resolve_btfids_clean
		$(call QUIET_CLEAN, bpf-progs)
		$(Q)$(RM) -r -- $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \
		$(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*

tools/bpf/resolve_btfids/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ libbpf-clean:
		clean: libsubcmd-clean libbpf-clean fixdep-clean
		$(call msg,CLEAN,$(BINARY))
		$(Q)$(RM) -f $(BINARY); \
		$(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \
		find $(if $(OUTPUT),$(OUTPUT),.) -name \.o -or -name \.o.cmd -or -name \*.o.d \| xargs $(RM)

		tags:

Admin message