From: Brian Norris <briannorris@chromium.org>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Ian Rogers <irogers@google.com>,
Thomas Richter <tmricht@linux.ibm.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org>,
Jiri Olsa <jolsa@kernel.org>
Subject: Re: [PATCH v3 3/3] tools build: Correct bpf fixdep dependencies
Date: Fri, 12 Jul 2024 13:23:57 -0700 [thread overview]
Message-ID: <ZpGQ3TShk-IGb4b1@google.com> (raw)
In-Reply-To: <CAEf4Bzb6-DLL966XKyMhe+nmpvdqYVrzfmfkAiDdFHNyD0qGWw@mail.gmail.com>
Hi Andrii,
On Fri, Jul 12, 2024 at 12:38:28PM -0700, Andrii Nakryiko wrote:
> I almost gave my acked-by and tested-by, but then I noticed that this
> leaves fixdep, staticobjs and sharedobjs directories as
> to-be-committed files. Please check, something is off with .gitignore
> or where those are put:
>
> $ cd ~/linux/tools/lib/bpf
> $ make -j90
> $ git st
> On branch master
> Your branch is ahead of 'bpf-next/master' by 4 commits.
> (use "git push" to publish your local commits)
>
> Untracked files:
> (use "git add <file>..." to include in what will be committed)
> fixdep
> sharedobjs/
> staticobjs/
>
> nothing added to commit but untracked files present (use "git add" to track)
>
>
> Other than that the changes look good, but we should be leaving
> uncommitted (and unignored) files around.
Thanks for looking and for the diligence. At first I thought I moved the
dirs by accident, but that's not the case. The problem is that I'm now
leaving a 'fixdep' artifact in these dirs (they already had a variety of
*.o, etc., files, which were already ignored), so the containing dirs
now show up in the untracked list. I've added a 'fixdep' .gitignore in
my upcoming v4, as well as proper cleaning (fixdep-clean) for it too.
> On Tue, Jul 9, 2024 at 1:43 PM Brian Norris <briannorris@chromium.org> wrote:
> > -$(BPF_IN_SHARED): force $(BPF_GENERATED)
> > +$(SHARED_OBJDIR):
> > + $(Q)mkdir -p $@
> > +
> > +$(STATIC_OBJDIR):
> > + $(Q)mkdir -p $@
>
> I'd probably combine the above two rules into one, but it's minor
Ack. I forgot some Makefile-language details when writing this part.
I'll update in v4.
I'll probably send v4 next week.
Thanks,
Brian
prev parent reply other threads:[~2024-07-12 20:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 20:41 [PATCH v3 0/3] tools build: Incorrect fixdep dependencies Brian Norris
2024-07-09 20:41 ` [PATCH v3 1/3] tools build: Correct libsubcmd " Brian Norris
2024-07-09 20:41 ` [PATCH v3 2/3] tools build: Avoid circular .fixdep-in.o.cmd issues Brian Norris
2024-07-09 20:41 ` [PATCH v3 3/3] tools build: Correct bpf fixdep dependencies Brian Norris
2024-07-12 19:38 ` Andrii Nakryiko
2024-07-12 20:23 ` Brian Norris [this message]
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=ZpGQ3TShk-IGb4b1@google.com \
--to=briannorris@chromium.org \
--cc=acme@redhat.com \
--cc=andrii.nakryiko@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=jpoimboe@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tmricht@linux.ibm.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