From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andriin@fb.com>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>,
Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>
Subject: Re: [PATCH bpf-next 2/4] tools/resolve_btfids: Check objects before removing
Date: Fri, 5 Feb 2021 15:19:14 -0800 [thread overview]
Message-ID: <CAEf4BzY6aJ5YfErvbY8AwuDztvgs4xrd5dC8y3vkxTZbiMppMA@mail.gmail.com> (raw)
In-Reply-To: <20210205124020.683286-3-jolsa@kernel.org>
On Fri, Feb 5, 2021 at 2:59 PM Jiri Olsa <jolsa@kernel.org> wrote:
>
> We want this clean to be called from tree's root clean
> and that one is silent if there's nothing to clean.
>
> Adding check for all object to clean and display CLEAN
> messages only if there are objects to remove.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
Acked-by: Andrii Nakryiko <andrii@kernel.org>
> tools/bpf/resolve_btfids/Makefile | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
> index 1d46a247ec95..be09ec4f03ff 100644
> --- a/tools/bpf/resolve_btfids/Makefile
> +++ b/tools/bpf/resolve_btfids/Makefile
> @@ -64,13 +64,20 @@ $(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN)
> $(call msg,LINK,$@)
> $(Q)$(CC) $(BINARY_IN) $(LDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS)
>
> +clean_objects := $(wildcard $(OUTPUT)/*.o \
> + $(OUTPUT)/.*.o.cmd \
> + $(OUTPUT)/.*.o.d \
> + $(OUTPUT)/libbpf \
> + $(OUTPUT)/libsubcmd \
> + $(OUTPUT)/resolve_btfids)
> +
> +ifneq ($(clean_objects),)
> clean: fixdep-clean
> $(call msg,CLEAN,$(BINARY))
> - $(Q)$(RM) -f $(BINARY); \
> - $(RM) -rf $(if $(OUTPUT),$(OUTPUT),.)/feature; \
> - $(RM) -rf $(OUTPUT)/libbpf; \
> - $(RM) -rf $(OUTPUT)/libsubcmd; \
> - find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)
> + $(Q)$(RM) -rf $(clean_objects)
> +else
> +clean:
> +endif
>
> tags:
> $(call msg,GEN,,tags)
> --
> 2.26.2
>
next prev parent reply other threads:[~2021-02-06 2:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 12:40 [PATCHv2 bpf-next 0/4] kbuild/resolve_btfids: Invoke resolve_btfids clean in root Makefile Jiri Olsa
2021-02-05 12:40 ` [PATCH bpf-next 1/4] tools/resolve_btfids: Build libbpf and libsubcmd in separate directories Jiri Olsa
2021-02-05 22:24 ` Andrii Nakryiko
2021-03-10 17:27 ` Viktor Jägersküpper
2021-03-10 19:27 ` Andrii Nakryiko
2021-03-10 22:42 ` Jiri Olsa
2021-02-05 12:40 ` [PATCH bpf-next 2/4] tools/resolve_btfids: Check objects before removing Jiri Olsa
2021-02-05 23:19 ` Andrii Nakryiko [this message]
2021-02-05 12:40 ` [PATCH bpf-next 3/4] tools/resolve_btfids: Set srctree variable unconditionally Jiri Olsa
2021-02-05 22:25 ` Andrii Nakryiko
2021-02-05 12:40 ` [PATCH bpf-next 4/4] kbuild: Add resolve_btfids clean to root clean target Jiri Olsa
2021-02-06 5:11 ` Amy Parker
2021-02-10 17:44 ` Nathan Chancellor
2021-02-10 17:52 ` Andrii Nakryiko
2021-02-10 18:02 ` Nathan Chancellor
2021-02-10 18:29 ` Jiri Olsa
2021-02-10 18:37 ` Nathan Chancellor
2021-02-10 19:26 ` Andrii Nakryiko
2021-02-11 12:17 ` Jiri Olsa
2021-02-12 3:30 ` Masahiro Yamada
2021-02-12 13:35 ` Jiri Olsa
2021-02-10 19:23 ` Andrii Nakryiko
2021-02-10 18:14 ` Jiri Olsa
2021-02-05 22:27 ` [PATCHv2 bpf-next 0/4] kbuild/resolve_btfids: Invoke resolve_btfids clean in root Makefile Andrii Nakryiko
2021-02-05 22:32 ` Jiri Olsa
2021-02-06 0:00 ` Jiri Olsa
2021-02-09 5:36 ` Andrii Nakryiko
2021-02-09 9:30 ` Jiri Olsa
[not found] <20210129134855.195810-1-jolsa@redhat.com>
2021-02-04 21:18 ` [PATCH " Jiri Olsa
2021-02-04 21:18 ` [PATCH bpf-next 2/4] tools/resolve_btfids: Check objects before removing Jiri Olsa
2021-02-04 23:41 ` Song Liu
2021-02-05 0:42 ` Andrii Nakryiko
2021-02-05 10:40 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEf4BzY6aJ5YfErvbY8AwuDztvgs4xrd5dC8y3vkxTZbiMppMA@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).