diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-18 06:58:39 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-18 06:58:39 -0400 |
| commit | 8d730cfb50cc77da6d00f941daef440918a1922f (patch) | |
| tree | 9679a9ba79e3c496058d351417a058432c42257d | |
| parent | 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 (diff) | |
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 <arnd@arndb.de>
Hacked about by David Woodhouse <dwmw2@infradead.org>
Reviewed and cleaned up by Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | scripts/Makefile.headersinst | 147 |
2 files changed, 160 insertions, 0 deletions
| @@ -856,6 +856,17 @@ depend dep: | |||
| 856 | @echo '*** Warning: make $@ is unnecessary now.' | 856 | @echo '*** Warning: make $@ is unnecessary now.' |
| 857 | 857 | ||
| 858 | # --------------------------------------------------------------------------- | 858 | # --------------------------------------------------------------------------- |
| 859 | # Kernel headers | ||
| 860 | INSTALL_HDR_PATH=$(MODLIB)/abi | ||
| 861 | export INSTALL_HDR_PATH | ||
| 862 | |||
| 863 | PHONY += headers_install | ||
| 864 | headers_install: include/linux/version.h | ||
| 865 | $(Q)unifdef -Ux /dev/null | ||
| 866 | $(Q)rm -rf $(INSTALL_HDR_PATH)/include | ||
| 867 | $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include | ||
| 868 | |||
| 869 | # --------------------------------------------------------------------------- | ||
| 859 | # Modules | 870 | # Modules |
| 860 | 871 | ||
| 861 | ifdef CONFIG_MODULES | 872 | ifdef CONFIG_MODULES |
| @@ -1027,6 +1038,8 @@ help: | |||
| 1027 | @echo ' cscope - Generate cscope index' | 1038 | @echo ' cscope - Generate cscope index' |
| 1028 | @echo ' kernelrelease - Output the release version string' | 1039 | @echo ' kernelrelease - Output the release version string' |
| 1029 | @echo ' kernelversion - Output the version stored in Makefile' | 1040 | @echo ' kernelversion - Output the version stored in Makefile' |
| 1041 | @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH' | ||
| 1042 | @echo ' (default: /lib/modules/$$VERSION/abi)' | ||
| 1030 | @echo '' | 1043 | @echo '' |
| 1031 | @echo 'Static analysers' | 1044 | @echo 'Static analysers' |
| 1032 | @echo ' checkstack - Generate a list of stack hogs' | 1045 | @echo ' checkstack - Generate a list of stack hogs' |
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst new file mode 100644 index 000000000000..688f8cb081d9 --- /dev/null +++ b/scripts/Makefile.headersinst | |||
| @@ -0,0 +1,147 @@ | |||
| 1 | # ========================================================================== | ||
| 2 | # Installing headers | ||
| 3 | # | ||
| 4 | # header-y files will be installed verbatim | ||
| 5 | # unifdef-y are the files where unifdef will be run before installing files | ||
| 6 | # objhdr-y are generated files that will be installed verbatim | ||
| 7 | # | ||
| 8 | # ========================================================================== | ||
| 9 | |||
| 10 | UNIFDEF := unifdef -U__KERNEL__ | ||
| 11 | |||
| 12 | # Eliminate the contents of (and inclusions of) compiler.h | ||
| 13 | HDRSED := sed -e "s/ inline / __inline__ /g" \ | ||
| 14 | -e "s/[[:space:]]__user[[:space:]]\+/ /g" \ | ||
| 15 | -e "s/(__user[[:space:]]\+/ (/g" \ | ||
| 16 | -e "s/[[:space:]]__force[[:space:]]\+/ /g" \ | ||
| 17 | -e "s/(__force[[:space:]]\+/ (/g" \ | ||
| 18 | -e "s/[[:space:]]__iomem[[:space:]]\+/ /g" \ | ||
| 19 | -e "s/(__iomem[[:space:]]\+/ (/g" \ | ||
| 20 | -e "s/[[:space:]]__attribute_const__[[:space:]]\+/\ /g" \ | ||
| 21 | -e "s/[[:space:]]__attribute_const__$$//" \ | ||
| 22 | -e "/^\#include <linux\/compiler.h>/d" | ||
| 23 | |||
| 24 | _dst := $(if $(dst),$(dst),$(obj)) | ||
| 25 | |||
| 26 | .PHONY: __headersinst | ||
| 27 | __headersinst: | ||
| 28 | |||
| 29 | |||
| 30 | ifeq (,$(patsubst include/asm/%,,$(obj)/)) | ||
| 31 | # For producing the generated stuff in include/asm for biarch builds, include | ||
| 32 | # both sets of Kbuild files; we'll generate anything which is mentioned in | ||
| 33 | # _either_ arch, and recurse into subdirectories which are mentioned in either | ||
| 34 | # arch. Since some directories may exist in one but not the other, we must | ||
| 35 | # use '-include'. | ||
| 36 | GENASM := 1 | ||
| 37 | archasm := $(subst include/asm,asm-$(ARCH),$(obj)) | ||
| 38 | altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj)) | ||
| 39 | -include $(srctree)/include/$(archasm)/Kbuild | ||
| 40 | -include $(srctree)/include/$(altarchasm)/Kbuild | ||
| 41 | else | ||
| 42 | include $(srctree)/$(obj)/Kbuild | ||
| 43 | endif | ||
| 44 | |||
| 45 | include scripts/Kbuild.include | ||
| 46 | |||
| 47 | # If this is include/asm-$(ARCH) and there's no $(ALTARCH), then | ||
| 48 | # override $(_dst) so that we install to include/asm directly. | ||
| 49 | ifeq ($(obj)$(ALTARCH),include/asm-$(ARCH)) | ||
| 50 | _dst := include/asm | ||
| 51 | endif | ||
| 52 | |||
| 53 | header-y := $(sort $(header-y)) | ||
| 54 | unifdef-y := $(sort $(unifdef-y)) | ||
| 55 | subdir-y := $(patsubst %/,%,$(filter %/, $(header-y))) | ||
| 56 | header-y := $(filter-out %/, $(header-y)) | ||
| 57 | header-y := $(filter-out $(unifdef-y),$(header-y)) | ||
| 58 | |||
| 59 | ifdef ALTARCH | ||
| 60 | ifeq ($(obj),include/asm-$(ARCH)) | ||
| 61 | altarch-y := altarch-dir | ||
| 62 | endif | ||
| 63 | endif | ||
| 64 | |||
| 65 | # Make the definitions visible for recursive make invocations | ||
| 66 | export ALTARCH | ||
| 67 | export ARCHDEF | ||
| 68 | export ALTARCHDEF | ||
| 69 | |||
| 70 | quiet_cmd_o_hdr_install = INSTALL $(_dst)/$@ | ||
| 71 | cmd_o_hdr_install = cp $(objtree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst) | ||
| 72 | |||
| 73 | quiet_cmd_headers_install = INSTALL $(_dst)/$@ | ||
| 74 | cmd_headers_install = $(HDRSED) $(srctree)/$(obj)/$@ \ | ||
| 75 | > $(INSTALL_HDR_PATH)/$(_dst)/$@ | ||
| 76 | |||
| 77 | quiet_cmd_unifdef = UNIFDEF $(_dst)/$@ | ||
| 78 | cmd_unifdef = $(UNIFDEF) $(srctree)/$(obj)/$@ | $(HDRSED) \ | ||
| 79 | > $(INSTALL_HDR_PATH)/$(_dst)/$@ || : | ||
| 80 | |||
| 81 | quiet_cmd_mkdir = MKDIR $@ | ||
| 82 | cmd_mkdir = mkdir -p $(INSTALL_HDR_PATH)/$@ | ||
| 83 | |||
| 84 | quiet_cmd_gen = GEN $(_dst)/$@ | ||
| 85 | cmd_gen = \ | ||
| 86 | STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_`; \ | ||
| 87 | (echo "/* File autogenerated by 'make headers_install' */" ; \ | ||
| 88 | echo "\#ifndef $$STUBDEF" ; \ | ||
| 89 | echo "\#define $$STUBDEF" ; \ | ||
| 90 | echo "\# if $(ARCHDEF)" ; \ | ||
| 91 | if [ -r $(srctree)/include/$(archasm)/$@ ]; then \ | ||
| 92 | echo "\# include <$(archasm)/$@>" ; \ | ||
| 93 | else \ | ||
| 94 | echo "\# error $(archasm)/$@ does not exist in" \ | ||
| 95 | "the $(ARCH) architecture" ; \ | ||
| 96 | fi ; \ | ||
| 97 | echo "\# elif $(ALTARCHDEF)" ; \ | ||
| 98 | if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then \ | ||
| 99 | echo "\# include <$(altarchasm)/$@>" ; \ | ||
| 100 | else \ | ||
| 101 | echo "\# error $(altarchasm)/$@ does not exist in" \ | ||
| 102 | "the $(ALTARCH) architecture" ; \ | ||
| 103 | fi ; \ | ||
| 104 | echo "\# else" ; \ | ||
| 105 | echo "\# warning This machine appears to be" \ | ||
| 106 | "neither $(ARCH) nor $(ALTARCH)." ; \ | ||
| 107 | echo "\# endif" ; \ | ||
| 108 | echo "\#endif /* $$STUBDEF */" ; \ | ||
| 109 | ) > $(INSTALL_HDR_PATH)/$(_dst)/$@ | ||
| 110 | |||
| 111 | __headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y) $(objhdr-y) | ||
| 112 | |||
| 113 | .PHONY: $(header-y) $(unifdef-y) $(subdir-y) | ||
| 114 | |||
| 115 | # Rules for installing headers | ||
| 116 | |||
| 117 | $(objhdr-y) $(subdir-y) $(header-y) $(unifdef-y): $(_dst) | ||
| 118 | |||
| 119 | .PHONY: $(_dst) | ||
| 120 | $(_dst): | ||
| 121 | $(call cmd,mkdir) | ||
| 122 | |||
| 123 | ifdef GENASM | ||
| 124 | $(objhdr-y) $(header-y) $(unifdef-y): | ||
| 125 | $(call cmd,gen) | ||
| 126 | |||
| 127 | else | ||
| 128 | $(objhdr-y): | ||
| 129 | $(call cmd,o_hdr_install) | ||
| 130 | |||
| 131 | $(header-y): | ||
| 132 | $(call cmd,headers_install) | ||
| 133 | |||
| 134 | $(unifdef-y): | ||
| 135 | $(call cmd,unifdef) | ||
| 136 | endif | ||
| 137 | |||
| 138 | hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj | ||
| 139 | |||
| 140 | .PHONY: altarch-dir | ||
| 141 | altarch-dir: | ||
| 142 | $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH) | ||
| 143 | $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm | ||
| 144 | |||
| 145 | # Recursion | ||
| 146 | $(subdir-y): | ||
| 147 | $(Q)$(MAKE) $(hdrinst)=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel) | ||
