Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230117-kernel-kheaders-gitignore-v2-1-1c29b3adf04a@weissschuh.net>
 <CAK7LNARi8Gm7n0nRidyf++YmW9zZ1qv7huN8nP3MCNzWGK42Cg@mail.gmail.com> <20230118005830.pqupfqnwwkd64q3g@t-8ch.de>
In-Reply-To: <20230118005830.pqupfqnwwkd64q3g@t-8ch.de>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Wed, 18 Jan 2023 14:02:45 +0900
Message-ID: <CAK7LNARo4H+wKFMjd-DuzS33eV_i86bZW-S7s4Y4q7V7M7NA6w@mail.gmail.com>
Subject: Re: [PATCH v2] kheaders: ignore and clean temporary kheaders_data directory
To:     =?UTF-8?Q?Thomas_Wei=C3=9Fschuh?= <linux@weissschuh.net>
Cc:     linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
        Nicolas Schier <n.schier@avm.de>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Jan 18, 2023 at 10:10 AM Thomas Wei=C3=9Fschuh <linux@weissschuh.ne=
t> wrote:
>
> On Tue, Jan 17, 2023 at 11:24:47PM +0900, Masahiro Yamada wrote:
> > On Tue, Jan 17, 2023 at 10:50 PM Thomas Wei=C3=9Fschuh <linux@weissschu=
h.net> wrote:
> > >
> > > If the kheaders archive generation is interrupted then this directory
> > > may be left.
> > > Ignore it, it will be deleted by the next run of kernel/gen_kheaders.=
sh.
> > > Also add it to clean-files so it can be cleaned up by make.
> > >
> > > Signed-off-by: Thomas Wei=C3=9Fschuh <linux@weissschuh.net>
> >
> >
> > Or, just rename the temporary directory.
> > For example,
> >
> >   cpio_dir=3D$outdir/$(dirname $tarfile)/.tmp_cpio_dir
> >
> >
> >
> > Dot files are ignored.
> > 'make clean' removes the .tmp_* pattern.
>
> This sounds great.
>
> Unfortunately 'make clean' only cleans files and not directories based
> on this pattern.


Agh, you are right.

Can you extend .tmp_* to match any file type?

Maybe, something like this?


 \( -name '*.[aios]' -o [snip] '*.*.symversions' \) -type f -print
-o -name '.tmp_*' -print


>
> Should it be extended?
>
> > > ---
> > > Changes in v2:
> > > - Also add the directory to clean-files
> > > - Link to v1: https://lore.kernel.org/r/20230117-kernel-kheaders-giti=
gnore-v1-1-2a3a070efd0d@weissschuh.net
> > > ---
> > >  kernel/.gitignore | 1 +
> > >  kernel/Makefile   | 2 +-
> > >  2 files changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/kernel/.gitignore b/kernel/.gitignore
> > > index c6b299a6b786..57ab1d703763 100644
> > > --- a/kernel/.gitignore
> > > +++ b/kernel/.gitignore
> > > @@ -1,3 +1,4 @@
> > >  # SPDX-License-Identifier: GPL-2.0-only
> > >  /config_data
> > >  /kheaders.md5
> > > +/kheaders_data.tar.xz.tmp/
> > > diff --git a/kernel/Makefile b/kernel/Makefile
> > > index 10ef068f598d..f3535944f635 100644
> > > --- a/kernel/Makefile
> > > +++ b/kernel/Makefile
> > > @@ -156,4 +156,4 @@ quiet_cmd_genikh =3D CHK     $(obj)/kheaders_data=
.tar.xz
> > >  $(obj)/kheaders_data.tar.xz: FORCE
> > >         $(call cmd,genikh)
> > >
> > > -clean-files :=3D kheaders_data.tar.xz kheaders.md5
> > > +clean-files :=3D kheaders_data.tar.xz kheaders.md5 kheaders_data.tar=
.xz.tmp
> > >
> > > ---
> > > base-commit: d532dd102151cc69fcd00b13e5a9689b23c0c8d9
> > > change-id: 20230117-kernel-kheaders-gitignore-f0d73456cb6b
> > >
> > > Best regards,
> > > --
> > > Thomas Wei=C3=9Fschuh <linux@weissschuh.net>


--=20
Best Regards
Masahiro Yamada