Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bpf/preload: Clean up .gitignore and "clean-files" target

kernel/bpf/preload/Makefile was recently updated to have it install
libbpf's headers locally instead of pulling them from tools/lib/bpf. But
two items still need to be addressed.

First, the local .gitignore file was not adjusted to ignore the files
generated in the new kernel/bpf/preload/libbpf output directory.

Second, the "clean-files" target is now incorrect. The old artefacts
names were not removed from the target, while the new ones were added
incorrectly. This is because "clean-files" expects names relative to
$(obj), but we passed the absolute path instead. This results in the
output and header-destination directories for libbpf (and their
contents) not being removed from kernel/bpf/preload on "make clean" from
the root of the repository.

This commit fixes both issues. Note that $(userprogs) needs not be added
to "clean-files", because the cleaning infrastructure already accounts
for it.

Cleaning the files properly also prevents make from printing the
following message, for builds coming after a "make clean":
"make[4]: Nothing to be done for 'install_headers'."

v2: Simplify the "clean-files" target.

Fixes: bf60791741d4 ("bpf: preload: Install libbpf headers when building")
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20211020094647.15564-1-quentin@isovalent.com

authored by

Quentin Monnet and committed by
Andrii Nakryiko
5f52d47c ebc7b50a

+2 -5
+1 -3
kernel/bpf/preload/.gitignore
··· 1 - /FEATURE-DUMP.libbpf 2 - /bpf_helper_defs.h 3 - /feature 1 + /libbpf 4 2 /bpf_preload_umd
+1 -2
kernel/bpf/preload/Makefile
··· 27 27 28 28 userprogs := bpf_preload_umd 29 29 30 - clean-files := $(userprogs) bpf_helper_defs.h FEATURE-DUMP.libbpf staticobjs/ feature/ 31 - clean-files += $(LIBBPF_OUT) $(LIBBPF_DESTDIR) 30 + clean-files := libbpf/ 32 31 33 32 $(obj)/iterators/iterators.o: | libbpf_hdrs 34 33