mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
05d8cba4a1
Since commit61562f981e("uapi: export all arch specifics directories"), "make INSTALL_HDR_PATH=$root/usr headers_install" deletes standard glibc headers and others in $(root)/usr/include. The cause of the issue is that headers_install now starts descending from arch/$(hdr-arch)/include/uapi with $(root)/usr/include for its destination when installing asm headers. So, headers already there are assumed to be unwanted. When headers_install starts descending from include/uapi with $(root)/usr/include for its destination, it works around the problem by creating an dummy destination $(root)/usr/include/uapi, but this is tricky. To fix the problem in a clean way is to skip headers install/check in include/uapi and arch/$(hdr-arch)/include/uapi because we know there are only sub-directories in uapi directories. A good side effect is the empty destination $(root)/usr/include/uapi will go away. I am also removing the trailing slash in the headers_check target to skip checking in arch/$(hdr-arch)/include/uapi. Fixes:61562f981e("uapi: export all arch specifics directories") Reported-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Dan Williams <dan.j.williams@intel.com> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
143 lines
4.6 KiB
Makefile
143 lines
4.6 KiB
Makefile
# ==========================================================================
|
|
# Installing headers
|
|
#
|
|
# All headers under include/uapi, include/generated/uapi,
|
|
# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are
|
|
# exported.
|
|
# They are preprocessed to remove __KERNEL__ section of the file.
|
|
#
|
|
# ==========================================================================
|
|
|
|
PHONY := __headers
|
|
__headers:
|
|
|
|
include scripts/Kbuild.include
|
|
|
|
srcdir := $(srctree)/$(obj)
|
|
subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.))
|
|
# caller may set destination dir (when installing to asm/)
|
|
_dst := $(if $(dst),$(dst),$(obj))
|
|
|
|
# Recursion
|
|
__headers: $(subdirs)
|
|
|
|
.PHONY: $(subdirs)
|
|
$(subdirs):
|
|
$(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@
|
|
|
|
# Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi.
|
|
# We have only sub-directories there.
|
|
skip-inst := $(if $(filter %/uapi,$(obj)),1)
|
|
|
|
ifeq ($(skip-inst),)
|
|
|
|
# generated header directory
|
|
gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
|
|
|
|
# Kbuild file is optional
|
|
kbuild-file := $(srctree)/$(obj)/Kbuild
|
|
-include $(kbuild-file)
|
|
|
|
old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
|
|
ifneq ($(wildcard $(old-kbuild-file)),)
|
|
include $(old-kbuild-file)
|
|
endif
|
|
|
|
installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
|
|
|
|
gendir := $(objtree)/$(gen)
|
|
header-files := $(notdir $(wildcard $(srcdir)/*.h))
|
|
header-files += $(notdir $(wildcard $(srcdir)/*.agh))
|
|
header-files := $(filter-out $(no-export-headers), $(header-files))
|
|
genhdr-files := $(notdir $(wildcard $(gendir)/*.h))
|
|
genhdr-files := $(filter-out $(header-files), $(genhdr-files))
|
|
|
|
# files used to track state of install/check
|
|
install-file := $(installdir)/.install
|
|
check-file := $(installdir)/.check
|
|
|
|
# generic-y list all files an architecture uses from asm-generic
|
|
# Use this to build a list of headers which require a wrapper
|
|
generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h))
|
|
wrapper-files := $(filter $(generic-files), $(generic-y))
|
|
wrapper-files := $(filter-out $(header-files), $(wrapper-files))
|
|
|
|
# all headers files for this dir
|
|
all-files := $(header-files) $(genhdr-files) $(wrapper-files)
|
|
output-files := $(addprefix $(installdir)/, $(all-files))
|
|
|
|
ifneq ($(mandatory-y),)
|
|
missing := $(filter-out $(all-files),$(mandatory-y))
|
|
ifneq ($(missing),)
|
|
$(error Some mandatory headers ($(missing)) are missing in $(obj))
|
|
endif
|
|
endif
|
|
|
|
# Work out what needs to be removed
|
|
oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
|
|
unwanted := $(filter-out $(all-files),$(oldheaders))
|
|
|
|
# Prefix unwanted with full paths to $(INSTALL_HDR_PATH)
|
|
unwanted-file := $(addprefix $(installdir)/, $(unwanted))
|
|
|
|
printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
|
|
|
|
quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
|
|
file$(if $(word 2, $(all-files)),s))
|
|
cmd_install = \
|
|
$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \
|
|
$(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \
|
|
for F in $(wrapper-files); do \
|
|
echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
|
|
done; \
|
|
touch $@
|
|
|
|
quiet_cmd_remove = REMOVE $(unwanted)
|
|
cmd_remove = rm -f $(unwanted-file)
|
|
|
|
quiet_cmd_check = CHECK $(printdir) ($(words $(all-files)) files)
|
|
# Headers list can be pretty long, xargs helps to avoid
|
|
# the "Argument list too long" error.
|
|
cmd_check = for f in $(all-files); do \
|
|
echo "$(installdir)/$${f}"; done \
|
|
| xargs \
|
|
$(PERL) $< $(INSTALL_HDR_PATH)/include $(SRCARCH); \
|
|
touch $@
|
|
|
|
ifndef HDRCHECK
|
|
# Rules for installing headers
|
|
__headers: $(install-file)
|
|
@:
|
|
|
|
targets += $(install-file)
|
|
$(install-file): scripts/headers_install.sh \
|
|
$(addprefix $(srcdir)/,$(header-files)) \
|
|
$(addprefix $(gendir)/,$(genhdr-files)) FORCE
|
|
$(if $(unwanted),$(call cmd,remove),)
|
|
$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
|
|
$(call if_changed,install)
|
|
|
|
else
|
|
__headers: $(check-file)
|
|
@:
|
|
|
|
targets += $(check-file)
|
|
$(check-file): scripts/headers_check.pl $(output-files) FORCE
|
|
$(call if_changed,check)
|
|
|
|
endif
|
|
|
|
targets := $(wildcard $(sort $(targets)))
|
|
cmd_files := $(wildcard \
|
|
$(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
|
|
|
|
ifneq ($(cmd_files),)
|
|
include $(cmd_files)
|
|
endif
|
|
|
|
endif # skip-inst
|
|
|
|
.PHONY: $(PHONY)
|
|
PHONY += FORCE
|
|
FORCE: ;
|