From b05d9892a42a9148e65b2d5b6d44bf6a81fdd72d Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Thu, 17 Oct 2019 19:44:50 -0700 Subject: [PATCH] techpack: Fix uapi headers_install Since commit ("kbuild: re-implement Makefile.headersinst without recursion"), the headers_install excludes Kbuild from providing information regarding uapi headers. In fact, it recursively pulls all the headers from a given path, in this case techpack/*. This isn't correct as techpack/ may have non-uapi headers as well, which shouldn't be considered. Hence, strictly look for include/uapi/$dir directory for the uapi headers. Change-Id: Ic7b3f927bc962729da1b87ed90e5f50a1e4cd5c5 Signed-off-by: Raghavendra Rao Ananta --- Makefile | 11 +++++++++-- techpack/Kbuild | 3 --- techpack/stub/include/uapi/{ => stub}/Kbuild | 0 3 files changed, 9 insertions(+), 5 deletions(-) rename techpack/stub/include/uapi/{ => stub}/Kbuild (100%) diff --git a/Makefile b/Makefile index a0d14e606ea4..2e3ff166b808 100644 --- a/Makefile +++ b/Makefile @@ -1196,19 +1196,26 @@ PHONY += archheaders archscripts hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj +techpack-dirs := $(shell find $(srctree)/techpack -maxdepth 1 -mindepth 1 -type d -not -name ".*") +techpack-dirs := $(subst $(srctree)/,,$(techpack-dirs)) + PHONY += headers headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi - $(Q)$(MAKE) $(hdr-inst)=techpack + $(Q)for d in $(techpack-dirs); do \ + $(MAKE) $(hdr-inst)=$$d/include/uapi; \ + done PHONY += headers_check headers_check: headers $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=techpack HDRCHECK=1 + $(Q)for d in $(techpack-dirs); do \ + $(MAKE) $(hdr-inst)=$$d/include/uapi HDRCHECK=1; \ + done ifdef CONFIG_HEADERS_INSTALL prepare: headers diff --git a/techpack/Kbuild b/techpack/Kbuild index 19b12c4af751..49ca44b5e3bc 100644 --- a/techpack/Kbuild +++ b/techpack/Kbuild @@ -3,6 +3,3 @@ TECHPACK?=y techpack-dirs := $(shell find $(srctree)/techpack -maxdepth 1 -mindepth 1 -xtype d -not -name ".*") obj-${TECHPACK} += stub/ $(addsuffix /,$(subst $(srctree)/techpack/,,$(techpack-dirs))) - -techpack-header-dirs := $(shell find $(srctree)/techpack -maxdepth 1 -mindepth 1 -type d -not -name ".*") -header-${TECHPACK} += $(addsuffix /include/uapi/,$(subst $(srctree)/techpack/,,$(techpack-header-dirs))) diff --git a/techpack/stub/include/uapi/Kbuild b/techpack/stub/include/uapi/stub/Kbuild similarity index 100% rename from techpack/stub/include/uapi/Kbuild rename to techpack/stub/include/uapi/stub/Kbuild