diff mbox series

[29/37] modpost: move -d option in scripts/Makefile.modpost

Message ID	20200601055731.3006266-29-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 29/37] modpost: move -d option in scripts/Makefile.modpost Date: Mon, 1 Jun 2020 14:57:23 +0900 Message-Id: <20200601055731.3006266-29-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

Commit Message

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

Collect options for modules into a single place.

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

 scripts/Makefile.modpost | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index bc9a03e8208d..b0c3634ff462 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -62,9 +62,6 @@  __modpost: vmlinux.symvers
 
 else
 
-MODPOST += \
-	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))
-
 ifeq ($(KBUILD_EXTMOD),)
 
 input-symdump := vmlinux.symvers
@@ -91,6 +88,7 @@  endif
 # modpost options for modules (both in-kernel and external)
 MODPOST += \
 	$(addprefix -i ,$(wildcard $(input-symdump))) \
+	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \
 	$(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)
 
 ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),)