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

Commit 365052f0 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Naitik Bharadiya
Browse files

uapi: export all arch specifics directories 



This patch removes the need of subdir-y. Now all files/directories under
arch/<arch>/include/uapi/ are exported.

The only change for userland is the layout of the command 'make
headers_install_all': directories asm-<arch> are replaced by arch-<arch>/.
Those new directories contains all files/directories of the specified arch.

Note that only cris and tile have more directories than only asm:
 - arch-v[10|32] for cris;
 - arch for tile.

Change-Id: I4b28551874c90a166f56af9adf1ef933b343dd04
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Git-Commit: 61562f981e9284ff7dfb2769d89c750986a5f677
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[bharad@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarNaitik Bharadiya <bharad@codeaurora.org>
parent 9e1c45ed

Documentation/kbuild/makefiles.txt

+1 −14
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. 
		--- 7.2 generic-y

		--- 7.3 generated-y

		--- 7.4 mandatory-y

		--- 7.5 subdir-y



	=== 8 Kbuild Variables

	=== 9 Makefile language
@@ -1264,7 +1263,7 @@ The pre-processing does: 
- drop all sections that are kernel internal (guarded by ifdef __KERNEL__)



All headers under include/uapi/, include/generated/uapi/,

arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/

arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/

are exported.



A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and
@@ -1325,18 +1324,6 @@ See subsequent chapter for the syntax of the Kbuild file. 
	The convention is to list one subdir per line and

	preferably in alphabetic order.



	--- 7.5 subdir-y



	subdir-y may be used to specify a subdirectory to be exported.



		Example:

			#arch/cris/include/uapi/asm/Kbuild

			subdir-y += ../arch-v10/arch/

			subdir-y += ../arch-v32/arch/



	The convention is to list one subdir per line and

	preferably in alphabetic order.



=== 8 Kbuild Variables



The top Makefile exports the following variables:

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ firmware_install: 
export INSTALL_HDR_PATH = $(objtree)/usr



# If we do an all arch process set dst to asm-$(hdr-arch)

hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)

hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include)



PHONY += archheaders

archheaders:
@@ -1321,7 +1321,7 @@ headers_install: __headers 
	$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \

	  $(error Headers not exportable for the $(SRCARCH) architecture))

	$(Q)$(MAKE) $(hdr-inst)=include/uapi

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst)

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst)

	$(Q)$(MAKE) $(hdr-inst)=techpack



PHONY += headers_check_all
@@ -1331,7 +1331,7 @@ headers_check_all: headers_install_all 
PHONY += headers_check

headers_check: headers_install

	$(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1

	$(Q)$(MAKE) $(hdr-inst)=techpack HDRCHECK=1



# ---------------------------------------------------------------------------

arch/cris/include/uapi/asm/Kbuild

+0 −3
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm
 


subdir-y += ../arch-v10/arch/

subdir-y += ../arch-v32/arch/

arch/tile/include/uapi/asm/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -2,5 +2,3 @@ 
include include/uapi/asm-generic/Kbuild.asm



generic-y += ucontext.h
 


subdir-y += ../arch

scripts/Makefile.headersinst

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Installing headers

#

# All headers under include/uapi, include/generated/uapi,

# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are

# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are

# exported.

# They are preprocessed to remove __KERNEL__ section of the file.

#
@@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) 
srcdir        := $(srctree)/$(obj)

gendir        := $(objtree)/$(gen)

subdirs       := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.))

subdirs       += $(subdir-y)

header-files  := $(notdir $(wildcard $(srcdir)/*.h))

header-files  += $(notdir $(wildcard $(srcdir)/*.agh))

header-files  := $(filter-out $(no-export-headers), $(header-files))