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

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

[Masahiro Yamada]

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@kernel.org>
---

 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..57d1841cc4ed 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 scripts/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

[PATCH 2/2] kbuild: remove headers_check stub

[Masahiro Yamada]

Linux 5.15 is out. Remove this stub now.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Makefile b/Makefile
index 0a6ecc8bb2d2..8d58f65e226b 100644
--- a/Makefile
+++ b/Makefile
@@ -1284,15 +1284,6 @@ headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts
 	$(Q)$(MAKE) $(hdr-inst)=include/uapi
 	$(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi
 
-# Deprecated. It is no-op now.
-PHONY += headers_check
-headers_check:
-	@echo >&2 "=================== WARNING ==================="
-	@echo >&2 "Since Linux 5.5, 'make headers_check' is no-op,"
-	@echo >&2 "and will be removed after Linux 5.15 release."
-	@echo >&2 "Please remove headers_check from your scripts."
-	@echo >&2 "==============================================="
-
 ifdef CONFIG_HEADERS_INSTALL
 prepare: headers
 endif
-- 
2.32.0

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

[Joe Perches]

On Mon, 2021-12-06 at 10:05 +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@kernel.org>
> ---
> 
>  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
[]
> @@ -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 scripts/headers_check.pl

Didn't you just move/rename this file?

> 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

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

[Masahiro Yamada]

On Mon, Dec 6, 2021 at 10:16 AM Joe Perches <joe@perches.com> wrote:
>
> On Mon, 2021-12-06 at 10:05 +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@kernel.org>
> > ---
> >
> >  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
> []
> > @@ -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 scripts/headers_check.pl
>
> Didn't you just move/rename this file?

My bad - it is the old file path.

Thanks, I will fix it.





> > 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
>
>


-- 
Best Regards
Masahiro Yamada