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

Commit 770e6f7e authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Gerrit - the friendly Code Review server
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>
Signed-off-by: default avatarSwetha Chikkaboraiah <schikk@codeaurora.org>
parent f34d9575

Documentation/kbuild/makefiles.txt

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

		--- 7.2 generic-y

		--- 7.3 generated-y

		--- 7.3 generated-y

		--- 7.4 mandatory-y

		--- 7.4 mandatory-y

		--- 7.5 subdir-y





	=== 8 Kbuild Variables

	=== 8 Kbuild Variables

	=== 9 Makefile language

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

- drop all sections that are kernel internal (guarded by ifdef __KERNEL__)





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

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.

are exported.





A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and

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

	The convention is to list one subdir per line and

	preferably in alphabetic order.

	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

=== 8 Kbuild Variables





The top Makefile exports the following variables:

The top Makefile exports the following variables:

Makefile

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

export INSTALL_HDR_PATH = $(objtree)/usr





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

# 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

PHONY += archheaders

archheaders:

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

	$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \

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

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

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

	$(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)





PHONY += headers_check_all

PHONY += headers_check_all

headers_check_all: headers_install_all

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

PHONY += headers_check

headers_check: headers_install

headers_check: headers_install

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

	$(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





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

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

# Kernel selftest

# Kernel selftest

arch/cris/include/uapi/asm/Kbuild

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

# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm
 
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 Original line Diff line number Diff line
@@ -2,5 +2,3 @@ 
include include/uapi/asm-generic/Kbuild.asm

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





generic-y += ucontext.h
 
generic-y += ucontext.h
 


subdir-y += ../arch

scripts/Makefile.headersinst

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

# Installing headers

#

#

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

# 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.

# exported.

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

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

#

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

srcdir        := $(srctree)/$(obj)

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

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

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

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

subdirs       += $(subdir-y)

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

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

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

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

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

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