From 8d730cfb50cc77da6d00f941daef440918a1922f Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 18 Jun 2006 11:58:39 +0100 Subject: Basic implementation of 'make headers_install' This adds a make target which exports a subset of headers which contain definitions which are useful for system libraries and tools. It uses the BSD 'unifdef' tool to remove instances of #ifdef __KERNEL__, and uses sed to remove markers like __user. Based on an original implementation by Arnd Bergmann Hacked about by David Woodhouse Reviewed and cleaned up by Sam Ravnborg Signed-off-by: David Woodhouse --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3494c17c9fb9..98e5af72983f 100644 --- a/Makefile +++ b/Makefile @@ -855,6 +855,17 @@ PHONY += depend dep depend dep: @echo '*** Warning: make $@ is unnecessary now.' +# --------------------------------------------------------------------------- +# Kernel headers +INSTALL_HDR_PATH=$(MODLIB)/abi +export INSTALL_HDR_PATH + +PHONY += headers_install +headers_install: include/linux/version.h + $(Q)unifdef -Ux /dev/null + $(Q)rm -rf $(INSTALL_HDR_PATH)/include + $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include + # --------------------------------------------------------------------------- # Modules @@ -1027,6 +1038,8 @@ help: @echo ' cscope - Generate cscope index' @echo ' kernelrelease - Output the release version string' @echo ' kernelversion - Output the version stored in Makefile' + @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH' + @echo ' (default: /lib/modules/$$VERSION/abi)' @echo '' @echo 'Static analysers' @echo ' checkstack - Generate a list of stack hogs' -- cgit v1.2.3 From 684753599afc76aa8f66c731bafb7204b39265b8 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 18 Jun 2006 12:02:10 +0100 Subject: Basic implementation of 'make headers_check' Based on the 'headers_install' target, this performs a basic sanity check on the exported headers -- so far only checking that they do not include any other headers which aren't selected for import, but easily extendable. Signed-off-by: David Woodhouse --- Makefile | 4 ++++ scripts/Makefile.headersinst | 11 +++++++++++ scripts/hdrcheck.sh | 8 ++++++++ 3 files changed, 23 insertions(+) create mode 100755 scripts/hdrcheck.sh (limited to 'Makefile') diff --git a/Makefile b/Makefile index 98e5af72983f..dbab1a9eabeb 100644 --- a/Makefile +++ b/Makefile @@ -866,6 +866,10 @@ headers_install: include/linux/version.h $(Q)rm -rf $(INSTALL_HDR_PATH)/include $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include +PHONY += headers_check +headers_check: headers_install + $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1 + # --------------------------------------------------------------------------- # Modules diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 688f8cb081d9..aa9990a3ccd6 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -78,6 +78,11 @@ quiet_cmd_unifdef = UNIFDEF $(_dst)/$@ cmd_unifdef = $(UNIFDEF) $(srctree)/$(obj)/$@ | $(HDRSED) \ > $(INSTALL_HDR_PATH)/$(_dst)/$@ || : +quiet_cmd_check = CHECK $(_dst)/$@ + cmd_check = $(srctree)/scripts/hdrcheck.sh \ + $(INSTALL_HDR_PATH)/include \ + $(INSTALL_HDR_PATH)/$(_dst)/$@ + quiet_cmd_mkdir = MKDIR $@ cmd_mkdir = mkdir -p $(INSTALL_HDR_PATH)/$@ @@ -112,6 +117,11 @@ __headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y) $(objhdr-y) .PHONY: $(header-y) $(unifdef-y) $(subdir-y) +ifdef HDRCHECK +# Rules for checking headers +$(objhdr-y) $(header-y) $(unifdef-y): + $(call cmd,check) +else # Rules for installing headers $(objhdr-y) $(subdir-y) $(header-y) $(unifdef-y): $(_dst) @@ -134,6 +144,7 @@ $(header-y): $(unifdef-y): $(call cmd,unifdef) endif +endif hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh new file mode 100755 index 000000000000..b3bb683b56b6 --- /dev/null +++ b/scripts/hdrcheck.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +for FILE in `grep '^#include <' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do + if [ ! -r $1/$FILE ]; then + echo $2 requires $FILE, which does not exist + exit 1 + fi +done -- cgit v1.2.3