[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <ZpGQ3TShk-IGb4b1@google.com>
Date: Fri, 12 Jul 2024 13:23:57 -0700
From: Brian Norris <briannorris@...omium.org>
To: Andrii Nakryiko <andrii.nakryiko@...il.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>,
Namhyung Kim <namhyung@...nel.org>, Ian Rogers <irogers@...gle.com>,
Thomas Richter <tmricht@...ux.ibm.com>,
Josh Poimboeuf <jpoimboe@...nel.org>,
Peter Zijlstra <peterz@...radead.org>, linux-kbuild@...r.kernel.org,
linux-kernel@...r.kernel.org, bpf@...r.kernel.org,
Masahiro Yamada <masahiroy@...nel.org>,
Jiri Olsa <jolsa@...nel.org>
Subject: Re: [PATCH v3 3/3] tools build: Correct bpf fixdep dependencies
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@...omium.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
Powered by blists - more mailing lists