]> git.baikalelectronics.ru Git - kernel.git/commit
bpf/preload: Clean up .gitignore and "clean-files" target
authorQuentin Monnet <quentin@isovalent.com>
Wed, 20 Oct 2021 09:46:47 +0000 (10:46 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Wed, 20 Oct 2021 17:39:04 +0000 (10:39 -0700)
commit30df1a3d0bf7f78ce9c4aed7ddb0d470e2824c23
treeb2aef7b79a8013d0aa3cae9a55ba4a6d938da158
parent5173cd643c4f49b596d9649f5bd300f74c54b0f3
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: aad66a9c800f ("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
kernel/bpf/preload/.gitignore
kernel/bpf/preload/Makefile