From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Sam Ravnborg <sam@ravnborg.org>, Nicolas Pitre <nico@fluxnic.net>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 03/11] kbuild: remove duplication from modules.order in sub-directories
Date: Thu, 11 Jul 2019 14:44:26 +0900 [thread overview]
Message-ID: <20190711054434.1177-4-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <20190711054434.1177-1-yamada.masahiro@socionext.com>
Currently, only the top-level modules.order drops duplicated entries.
The modules.order files in sub-directories potentially contain
duplication. To list out the paths of all modules, I want to use
modules.order instead of parsing *.mod files in $(MODVERDIR).
To achieve this, I want to rip off duplication from modules.order
of external modules too.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v2: None
scripts/Makefile.build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index f21d691c776a..98dede0b2ca8 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -423,13 +423,10 @@ endif # builtin-target
#
# Create commands to either record .ko file or cat modules.order from
# a subdirectory
-modorder-cmds = \
- $(foreach m, $(modorder), \
- $(if $(filter %/modules.order, $m), \
- cat $m;, echo $m;))
-
$(modorder-target): $(subdir-ym) FORCE
- $(Q)(cat /dev/null; $(modorder-cmds)) > $@
+ $(Q){ $(foreach m, $(modorder), \
+ $(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \
+ | $(AWK) '!x[$$0]++' - > $@
#
# Rule to compile a set of .o files into one .a file (with symbol table)
--
2.17.1
next prev parent reply other threads:[~2019-07-11 5:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 5:44 [PATCH v2 00/11] kbuild: create *.mod with directory path and remove MODVERDIR Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 01/11] kbuild: do not create empty modules.order in the prepare stage Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 02/11] kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin} Masahiro Yamada
2019-07-11 5:44 ` Masahiro Yamada [this message]
2019-07-11 5:44 ` [PATCH v2 04/11] scsi: remove pointless $(MODVERDIR)/$(obj)/53c700.ver Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 05/11] kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 06/11] kbuild: modsign: " Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 07/11] kbuild: modpost: " Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 08/11] kbuild: create *.mod with full directory path and remove MODVERDIR Masahiro Yamada
2019-07-16 21:40 ` Joe Lawrence
2019-07-17 5:21 ` Masahiro Yamada
2019-07-18 20:18 ` Joe Lawrence
2019-07-20 5:09 ` Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 09/11] kbuild: remove the first line of *.mod files Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 10/11] kbuild: remove 'prepare1' target Masahiro Yamada
2019-07-11 5:44 ` [PATCH v2 11/11] kbuild: split out *.mod out of {single,multi}-used-m rules Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190711054434.1177-4-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=nico@fluxnic.net \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).