| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 |
- diff -Nur linux-3.10.30.orig/scripts/Makefile.headersinst linux-3.10.30/scripts/Makefile.headersinst
- --- linux-3.10.30.orig/scripts/Makefile.headersinst 2014-02-13 22:48:15.000000000 +0100
- +++ linux-3.10.30/scripts/Makefile.headersinst 2014-05-16 13:27:10.577424606 +0200
- @@ -47,18 +47,24 @@
- all-files := $(header-y) $(genhdr-y) $(wrapper-files)
- output-files := $(addprefix $(installdir)/, $(all-files))
-
- -input-files := $(foreach hdr, $(header-y), \
- +input-files1 := $(foreach hdr, $(header-y), \
- $(if $(wildcard $(srcdir)/$(hdr)), \
- - $(wildcard $(srcdir)/$(hdr)), \
- + $(wildcard $(srcdir)/$(hdr))) \
- + )
- +input-files1-name := $(notdir $(input-files1))
- +input-files2 := $(foreach hdr, $(header-y), \
- + $(if $(wildcard $(srcdir)/$(hdr)),, \
- $(if $(wildcard $(oldsrcdir)/$(hdr)), \
- $(wildcard $(oldsrcdir)/$(hdr)), \
- $(error Missing UAPI file $(srcdir)/$(hdr))) \
- - )) \
- - $(foreach hdr, $(genhdr-y), \
- + ))
- +input-files2-name := $(notdir $(input-files2))
- +input-files3 := $(foreach hdr, $(genhdr-y), \
- $(if $(wildcard $(gendir)/$(hdr)), \
- $(wildcard $(gendir)/$(hdr)), \
- $(error Missing generated UAPI file $(gendir)/$(hdr)) \
- ))
- +input-files3-name := $(notdir $(input-files3))
-
- # Work out what needs to be removed
- oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
- @@ -72,7 +78,9 @@
- quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
- file$(if $(word 2, $(all-files)),s))
- cmd_install = \
- - $(CONFIG_SHELL) $< $(installdir) $(input-files); \
- + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
- + $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
- + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
- for F in $(wrapper-files); do \
- echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
- done; \
- @@ -98,8 +106,7 @@
- @:
-
- targets += $(install-file)
- -$(install-file): scripts/headers_install.sh $(input-files) FORCE
- - $(if $(unwanted),$(call cmd,remove),)
- +$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
- $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- $(call if_changed,install)
-
|
