diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-07-09 14:33:00 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-07-11 08:33:54 -0400 |
commit | 09c3776c5472f2bc73b29b13d5947cec6103a99c (patch) | |
tree | 2ce1061b50da200aebbd745ab7a61174117e5a9c /scripts/Makefile.headersinst | |
parent | a9d9a400e0753491e3eacc9f4dbc60547ea1de45 (diff) |
kbuild: remove wrapper files handling from Makefile.headersinst
scripts/Makefike.headersinst creates asm-generic wrappers by itself
because scripts/Makefile.asm-generic created some of exported wrappers
outside uapi directories.
Now this distortion has been fixed. scripts/Makefile.headersinst can
simply copy wrappers created by scripts/Makefile.asm-generic.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/Makefile.headersinst')
-rw-r--r-- | scripts/Makefile.headersinst | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index e6343b34182a..343d586e566e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst | |||
@@ -52,14 +52,8 @@ genhdr-files := $(filter-out $(header-files), $(genhdr-files)) | |||
52 | install-file := $(installdir)/.install | 52 | install-file := $(installdir)/.install |
53 | check-file := $(installdir)/.check | 53 | check-file := $(installdir)/.check |
54 | 54 | ||
55 | # generic-y list all files an architecture uses from asm-generic | ||
56 | # Use this to build a list of headers which require a wrapper | ||
57 | generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) | ||
58 | wrapper-files := $(filter $(generic-files), $(generic-y)) | ||
59 | wrapper-files := $(filter-out $(header-files), $(wrapper-files)) | ||
60 | |||
61 | # all headers files for this dir | 55 | # all headers files for this dir |
62 | all-files := $(header-files) $(genhdr-files) $(wrapper-files) | 56 | all-files := $(header-files) $(genhdr-files) |
63 | output-files := $(addprefix $(installdir)/, $(all-files)) | 57 | output-files := $(addprefix $(installdir)/, $(all-files)) |
64 | 58 | ||
65 | ifneq ($(mandatory-y),) | 59 | ifneq ($(mandatory-y),) |
@@ -83,9 +77,6 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ | |||
83 | cmd_install = \ | 77 | cmd_install = \ |
84 | $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ | 78 | $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ |
85 | $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ | 79 | $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ |
86 | for F in $(wrapper-files); do \ | ||
87 | echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ | ||
88 | done; \ | ||
89 | touch $@ | 80 | touch $@ |
90 | 81 | ||
91 | quiet_cmd_remove = REMOVE $(unwanted) | 82 | quiet_cmd_remove = REMOVE $(unwanted) |