Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b05d9892 authored by Raghavendra Rao Ananta's avatar Raghavendra Rao Ananta
Browse files

techpack: Fix uapi headers_install 



Since commit <d5470d14> ("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: default avatarRaghavendra Rao Ananta <rananta@codeaurora.org>
parent 86cb2da5

Makefile

+9 −2
Original line number Diff line number Diff line
@@ -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

techpack/Kbuild

+0 −3
Original line number Diff line number Diff line
@@ -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)))