Skip to contentSkip to conversation

bpf/preload: make sure Makefile cleans up after itself, and add .gitignore

PATCH Applied Toke Høiland-Jørgensen 2 participants 2 messages Sep 27, 2020 – Sep 29, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf/preload: make sure Makefile cleans up after itself, and add .gitignore

The Makefile in bpf/preload builds a local copy of libbpf, but does not properly clean up after itself. This can lead to subsequent compilation failures, since the feature detection cache is kept around which can lead subsequent detection to fail.

Fix this by properly setting clean-files, and while we're at it, also add a .gitignore for the directory to ignore the build artifacts.

Fixes d71fa5c9763c ("bpf: Add kernel module with user mode driver that populates bpffs.")
---
 kernel/bpf/preload/.gitignore | 4 ++++
 kernel/bpf/preload/Makefile   | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 kernel/bpf/preload/.gitignore
kernel/bpf/preload/.gitignore new file +4 -0
new file mode 100644
index 000000000000..856a4c5ad0dd
@@ -0,0 +1,4 @@
+/FEATURE-DUMP.libbpf
+/bpf_helper_defs.h
+/feature
+/bpf_preload_umd
kernel/bpf/preload/Makefile +2 -0
index 12c7b62b9b6e..23ee310b6eb4 100644
@@ -12,6 +12,8 @@ userccflags += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi \
 
 userprogs := bpf_preload_umd
 
+clean-files := $(userprogs) bpf_helper_defs.h FEATURE-DUMP.libbpf staticobjs/ feature/
+
 bpf_preload_umd-objs := iterators/iterators.o
 bpf_preload_umd-userldlibs := $(LIBBPF_A) -lelf -lz
 
Signature · 1 line
2.28.0
#1 lore raw
This patch was applied to bpf/bpf-next.git (refs/heads/master):

Hello:

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

Quoted 9 lines · On Sun, 27 Sep 2020 21:30:05 +0200 you wrote:

The Makefile in bpf/preload builds a local copy of libbpf, but does not properly clean up after itself. This can lead to subsequent compilation failures, since the feature detection cache is kept around which can lead subsequent detection to fail.

Fix this by properly setting clean-files, and while we're at it, also add a .gitignore for the directory to ignore the build artifacts.

[...]

Here is the summary with links:
- [bpf-next] bpf/preload: make sure Makefile cleans up after itself, and add .gitignore

    https://git.kernel.org/bpf/bpf-next/c/9d9aae53b96d

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