Skip to contentSkip to conversation

kbuild: move headers_check.pl to usr/include/

PATCH Superseded Masahiro Yamada 2 participants 4 messages Dec 6, 2021 Kbuild

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

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.

---

 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%)
include/uapi/linux/soundcard.h +1 -1
index f3b21f989872..57d1841cc4ed 100644
@@ -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()
usr/include/Makefile +1 -1
index 1c2ae1368079..0e9c3e72f43a 100644
@@ -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
usr/include/headers_check.pl renamed from scripts/headers_check.pl +0 -0
similarity index 100%
rename from scripts/headers_check.pl
rename to usr/include/headers_check.pl
Signature · 1 line
2.32.0
#1 lore raw

PATCH 2/2 kbuild: remove headers_check stub

Linux 5.15 is out. Remove this stub now.

---

 Makefile | 9 ---------
 1 file changed, 9 deletions(-)
Makefile +0 -9
index 0a6ecc8bb2d2..8d58f65e226b 100644
@@ -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
Signature · 1 line
2.32.0
#2 lore raw
In reply to Masahiro Yamada

include/uapi/linux/soundcard.h

Quoted 16 lines · 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.

---

 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%)
include/uapi/linux/soundcard.h +0 -0

[]

include/uapi/linux/soundcard.h typedef struct mixer_vol_table { · line 1054

Quoted 6 lines
include/uapi/linux/soundcard.h +1 -1
@@ -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?

Quoted 4 lines
usr/include/headers_check.pl renamed from scripts/headers_check.pl +0 -0
similarity index 100%
rename from scripts/headers_check.pl
rename to usr/include/headers_check.pl
#3 lore raw
Quoted 19 lines · Joe Perches

include/uapi/linux/soundcard.h

Quoted 16 lines · 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.

---

 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%)
include/uapi/linux/soundcard.h +0 -0

[]

Quoted 8 lines

include/uapi/linux/soundcard.h typedef struct mixer_vol_table { · line 1054

Quoted 6 lines
include/uapi/linux/soundcard.h +1 -1
@@ -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.

Quoted 6 lines
Quoted 4 lines
usr/include/headers_check.pl renamed from scripts/headers_check.pl +0 -0
similarity index 100%
rename from scripts/headers_check.pl
rename to usr/include/headers_check.pl
Signature · 2 lines
Best Regards
Masahiro Yamada