bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore
@ 2020-11-12  9:10 Jean-Philippe Brucker
  2020-11-12  9:10 ` [PATCH bpf-next 2/2] tools/bpf: Always run the *-clean recipes Jean-Philippe Brucker
  2020-11-12 19:20 ` [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore patchwork-bot+netdevbpf
  0 siblings, 2 replies; 3+ messages in thread
From: Jean-Philippe Brucker @ 2020-11-12  9:10 UTC (permalink / raw)
  To: andrii
  Cc: bpf, ast, daniel, kafai, songliubraving, yhs, john.fastabend,
	kpsingh, Jean-Philippe Brucker

Commit 8859b0da5aac ("tools/bpftool: Fix cross-build") added a
build-time bootstrap/ directory for bpftool, and removed
bpftool-bootstrap. Update .gitignore accordingly.

Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
See https://lore.kernel.org/bpf/CAEf4BzbYcgzbrwS2uH0NDa+0O48BUXvZ0ySV+xcw6-inrro-UA@mail.gmail.com/
---
 tools/bpf/bpftool/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/.gitignore b/tools/bpf/bpftool/.gitignore
index 3e601bcfd461..944cb4b7c95d 100644
--- a/tools/bpf/bpftool/.gitignore
+++ b/tools/bpf/bpftool/.gitignore
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 *.d
-/bpftool-bootstrap
+/bootstrap/
 /bpftool
 bpftool*.8
 bpf-helpers.*
-- 
2.29.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH bpf-next 2/2] tools/bpf: Always run the *-clean recipes
  2020-11-12  9:10 [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore Jean-Philippe Brucker
@ 2020-11-12  9:10 ` Jean-Philippe Brucker
  2020-11-12 19:20 ` [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: Jean-Philippe Brucker @ 2020-11-12  9:10 UTC (permalink / raw)
  To: andrii
  Cc: bpf, ast, daniel, kafai, songliubraving, yhs, john.fastabend,
	kpsingh, Jean-Philippe Brucker

Make $(LIBBPF)-clean and $(LIBBPF_BOOTSTRAP)-clean .PHONY targets, in
case those files exist. And keep consistency within the Makefile by
making the directory dependencies order-only.

Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
See https://lore.kernel.org/bpf/CAEf4BzZqiFeLVYq-X7Z7cypRYSgLFw3dr=-EEoyzWaDJVFfzug@mail.gmail.com/
---
 tools/bpf/bpftool/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index 804ade95929f..f897cb5fb12d 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -44,11 +44,11 @@ $(LIBBPF_BOOTSTRAP): FORCE | $(LIBBPF_BOOTSTRAP_OUTPUT)
 	$(Q)$(MAKE) -C $(BPF_DIR) OUTPUT=$(LIBBPF_BOOTSTRAP_OUTPUT) \
 		ARCH= CC=$(HOSTCC) LD=$(HOSTLD) $@
 
-$(LIBBPF)-clean: $(LIBBPF_OUTPUT)
+$(LIBBPF)-clean: FORCE | $(LIBBPF_OUTPUT)
 	$(call QUIET_CLEAN, libbpf)
 	$(Q)$(MAKE) -C $(BPF_DIR) OUTPUT=$(LIBBPF_OUTPUT) clean >/dev/null
 
-$(LIBBPF_BOOTSTRAP)-clean: $(LIBBPF_BOOTSTRAP_OUTPUT)
+$(LIBBPF_BOOTSTRAP)-clean: FORCE | $(LIBBPF_BOOTSTRAP_OUTPUT)
 	$(call QUIET_CLEAN, libbpf-bootstrap)
 	$(Q)$(MAKE) -C $(BPF_DIR) OUTPUT=$(LIBBPF_BOOTSTRAP_OUTPUT) clean >/dev/null
 
-- 
2.29.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore
  2020-11-12  9:10 [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore Jean-Philippe Brucker
  2020-11-12  9:10 ` [PATCH bpf-next 2/2] tools/bpf: Always run the *-clean recipes Jean-Philippe Brucker
@ 2020-11-12 19:20 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2020-11-12 19:20 UTC (permalink / raw)
  To: Jean-Philippe Brucker
  Cc: andrii, bpf, ast, daniel, kafai, songliubraving, yhs,
	john.fastabend, kpsingh

Hello:

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

On Thu, 12 Nov 2020 10:10:50 +0100 you wrote:
> Commit 8859b0da5aac ("tools/bpftool: Fix cross-build") added a
> build-time bootstrap/ directory for bpftool, and removed
> bpftool-bootstrap. Update .gitignore accordingly.
> 
> Reported-by: Andrii Nakryiko <andrii@kernel.org>
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> 
> [...]

Here is the summary with links:
  - [bpf-next,1/2] tools/bpf: Add bootstrap/ to .gitignore
    https://git.kernel.org/bpf/bpf-next/c/6a59edd832e2
  - [bpf-next,2/2] tools/bpf: Always run the *-clean recipes
    https://git.kernel.org/bpf/bpf-next/c/c36538798fc6

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



^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-12 19:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-12  9:10 [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore Jean-Philippe Brucker
2020-11-12  9:10 ` [PATCH bpf-next 2/2] tools/bpf: Always run the *-clean recipes Jean-Philippe Brucker
2020-11-12 19:20 ` [PATCH bpf-next 1/2] tools/bpf: Add bootstrap/ to .gitignore patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).