[03/37] kbuild: merge init-y into core-y

Message ID	20200601055731.3006266-3-masahiroy@kernel.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=zPiC=7O=vger.kernel.org=linux-kbuild-owner@kernel.org> From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH 03/37] kbuild: merge init-y into core-y Date: Mon, 1 Jun 2020 14:56:57 +0900 Message-Id: <20200601055731.3006266-3-masahiroy@kernel.org> In-Reply-To: <20200601055731.3006266-1-masahiroy@kernel.org> References: <20200601055731.3006266-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk
Series	[01/37] kbuild: refactor subdir-ym calculation \| expand [01/37] kbuild: refactor subdir-ym calculation [02/37] kbuild: refactor tagets caluculation for KBUILD_{BUILTIN,KBUILD_MODULES} [03/37] kbuild: merge init-y into core-y [04/37] kbuild: merge net-y and virt-y into drivers-y [05/37] kbuild: refactor KBUILD_VMLINUX_{OBJS,LIBS} calculation [06/37] kbuild: update modules.order only when contained modules are updated [07/37] modpost: fix -i (--ignore-errors) MAKEFLAGS detection [08/37] modpost: move -T option close to the modpost command [09/37] modpost: pass -N option only for modules modpost [10/37] modpost: load KBUILD_EXTRA_SYMBOLS files in order [11/37] modpost: track if the symbol origin is a dump file or ELF object [12/37] modpost: allow to pass -i option multiple times to remove -e option [13/37] modpost: rename ext_sym_list to dump_list [14/37] modpost: re-add -e to set external_module flag [15/37] modpost: print symbol dump file as the build target in short log [16/37] modpost: refactor -i option calculation [17/37] modpost: generate vmlinux.symvers and reuse it for the second modpost [18/37] modpost: invoke modpost only when input files are updated [19/37] modpost: show warning if vmlinux is not found when processing modules [20/37] modpost: show warning if any of symbol dump files is missing [21/37] modpost: drop RCS/CVS $Revision handling in MODULE_VERSION() [22/37] modpost: do not call get_modinfo() for vmlinux(.o) [23/37] modpost: add read_text_file() and get_line() helpers [24/37] modpost: fix potential mmap'ed file overrun in get_src_version() [25/37] modpost: avoid false-positive file open error [26/37] modpost: use read_text_file() and get_line() for reading text files [27/37] modpost: remove get_next_text() and make {grab,release_}file static [28/37] modpost: remove -s option [29/37] modpost: move -d option in scripts/Makefile.modpost [30/37] modpost: remove mod->is_dot_o struct member [31/37] modpost: remove is_vmlinux() call in check_for_{gpl_usage,unused}() [32/37] modpost: add mod->is_vmlinux struct member [33/37] modpost: remove mod->skip struct member [34/37] modpost: set have_vmlinux in new_module() [35/37] modpost: strip .o from modname before calling new_module() [36/37] modpost: remove is_vmlinux() helper [37/37] modpost: change elf_info->size to size_t

Message ID

20200601055731.3006266-3-masahiroy@kernel.org (mailing list archive)

State

New, archived

Headers

From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH 03/37] kbuild: merge init-y into core-y
Date: Mon,  1 Jun 2020 14:56:57 +0900
Message-Id: <20200601055731.3006266-3-masahiroy@kernel.org>
In-Reply-To: <20200601055731.3006266-1-masahiroy@kernel.org>
References: <20200601055731.3006266-1-masahiroy@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk

Series

[01/37] kbuild: refactor subdir-ym calculation | expand

Commit Message

Masahiro Yamada June 1, 2020, 5:56 a.m. UTC

No arch Makefile specifies init-y.

Merge init-y into core-y. This does not change the link order.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 44921d9cf3cf..f9c37045cf64 100644
--- a/Makefile
+++ b/Makefile
@@ -643,12 +643,11 @@  endif
 
 ifeq ($(KBUILD_EXTMOD),)
 # Objects we will link into vmlinux / subdirs we need to visit
-init-y		:= init/
+core-y		:= init/ usr/
 drivers-y	:= drivers/ sound/
 drivers-$(CONFIG_SAMPLES) += samples/
 net-y		:= net/
 libs-y		:= lib/
-core-y		:= usr/
 virt-y		:= virt/
 endif # KBUILD_EXTMOD
 
@@ -1060,18 +1059,17 @@  export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps
 ifeq ($(KBUILD_EXTMOD),)
 core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
 
-vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
 		     $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))
 
 vmlinux-alldirs	:= $(sort $(vmlinux-dirs) Documentation \
-		     $(patsubst %/,%,$(filter %/, $(init-) $(core-) \
+		     $(patsubst %/,%,$(filter %/, $(core-) \
 			$(drivers-) $(net-) $(libs-) $(virt-))))
 
 build-dirs	:= $(vmlinux-dirs)
 clean-dirs	:= $(vmlinux-alldirs)
 
-init-y		:= $(patsubst %/, %/built-in.a, $(init-y))
 core-y		:= $(patsubst %/, %/built-in.a, $(core-y))
 drivers-y	:= $(patsubst %/, %/built-in.a, $(drivers-y))
 net-y		:= $(patsubst %/, %/built-in.a, $(net-y))
@@ -1085,7 +1083,7 @@  endif
 virt-y		:= $(patsubst %/, %/built-in.a, $(virt-y))
 
 # Externally visible symbols (used by link-vmlinux.sh)
-export KBUILD_VMLINUX_OBJS := $(head-y) $(init-y) $(core-y) $(libs-y2) \
+export KBUILD_VMLINUX_OBJS := $(head-y) $(core-y) $(libs-y2) \
 			      $(drivers-y) $(net-y) $(virt-y)
 export KBUILD_VMLINUX_LIBS := $(libs-y1)
 export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds

[03/37] kbuild: merge init-y into core-y

Commit Message

Patch