Re: [PATCH v2 1/2] kbuild: move headers_check.pl to usr/include/

[Masahiro Yamada]

On Sat, Jan 8, 2022 at 3:49 AM Nathan Chancellor <nathan@xxxxxxxxxx> wrote:
>
> Hi Masahiro,
>
> On Mon, Dec 06, 2021 at 11:35:06AM +0900, Masahiro Yamada wrote:
> > This script is only used by usr/include/Makefile. Make it local to
> > the directory.
> >
> > Update the comment in include/uapi/linux/soundcard.h because
> > 'make headers_check' is no longer functional.
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> > ---
> >
> > Changes in v2:
> >  - Fix the comment in soundcard.sh to point to the new file path
> >
> >  include/uapi/linux/soundcard.h            | 2 +-
> >  usr/include/Makefile                      | 2 +-
> >  {scripts => usr/include}/headers_check.pl | 0
> >  3 files changed, 2 insertions(+), 2 deletions(-)
> >  rename {scripts => usr/include}/headers_check.pl (100%)
> >
> > diff --git a/include/uapi/linux/soundcard.h b/include/uapi/linux/soundcard.h
> > index f3b21f989872..ac1318793a86 100644
> > --- a/include/uapi/linux/soundcard.h
> > +++ b/include/uapi/linux/soundcard.h
> > @@ -1051,7 +1051,7 @@ typedef struct mixer_vol_table {
> >   *   the GPL version of OSS-4.x and build against that version
> >   *   of the header.
> >   *
> > - *   We redefine the extern keyword so that make headers_check
> > + *   We redefine the extern keyword so that usr/include/headers_check.pl
> >   *   does not complain about SEQ_USE_EXTBUF.
> >   */
> >  #define SEQ_DECLAREBUF()             SEQ_USE_EXTBUF()
> > diff --git a/usr/include/Makefile b/usr/include/Makefile
> > index 1c2ae1368079..0e9c3e72f43a 100644
> > --- a/usr/include/Makefile
> > +++ b/usr/include/Makefile
> > @@ -99,7 +99,7 @@ quiet_cmd_hdrtest = HDRTEST $<
> >        cmd_hdrtest = \
> >               $(CC) $(c_flags) -S -o /dev/null -x c /dev/null \
> >                       $(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \
> > -             $(PERL) $(srctree)/scripts/headers_check.pl $(obj) $(SRCARCH) $<; \
> > +             $(PERL) $(srctree)/$(src)/headers_check.pl $(obj) $(SRCARCH) $<; \
> >               touch $@
> >
> >  $(obj)/%.hdrtest: $(obj)/%.h FORCE
> > diff --git a/scripts/headers_check.pl b/usr/include/headers_check.pl
> > similarity index 100%
> > rename from scripts/headers_check.pl
> > rename to usr/include/headers_check.pl
> > --
> > 2.32.0
> >
> >
>
> After this patch landed in -next, with a completely clean tree, I see:
>
> $ make clean
>   CLEAN   usr/include
>
> $ git status --short
>  D usr/include/headers_check.pl
>
> Is something like this needed?
>
> diff --git a/usr/include/Makefile b/usr/include/Makefile
> index 0e9c3e72f43a..6e9dfd657e89 100644
> --- a/usr/include/Makefile
> +++ b/usr/include/Makefile
> @@ -105,4 +105,4 @@ quiet_cmd_hdrtest = HDRTEST $<
>  $(obj)/%.hdrtest: $(obj)/%.h FORCE
>         $(call if_changed_dep,hdrtest)
>
> -clean-files += $(filter-out Makefile, $(notdir $(wildcard $(obj)/*)))
> +clean-files += $(filter-out headers_check.pl Makefile, $(notdir $(wildcard $(obj)/*)))

Ah, right.
I will squash this.
Thanks.



-- 
Best Regards
Masahiro Yamada