* [PATCH] kbuild: remove trailing slashes from $(KBUILD_EXTMOD)
@ 2021-06-02 9:52 Masahiro Yamada
0 siblings, 0 replies; only message in thread
From: Masahiro Yamada @ 2021-06-02 9:52 UTC (permalink / raw
To: linux-kbuild; +Cc: linux-kernel, Johannes Berg, Masahiro Yamada, Michal Marek
M= (or KBUILD_EXTMOD) generally expects a directory path without any
trailing slashes, like M=a/b/c.
If you add a trailing slash, like M=a/b/c/, you will get ugly build
logs (two slashes in a series), but it still works fine as long as it
is consistent between 'make modules' and 'make modules_install'.
So, the following code correctly builds and installs the modules.
$ make M=a/b/c/ modules
$ sudo make M=a/b/c/ modules_install
Since commit ccae4cfa7bfb ("kbuild: refactor scripts/Makefile.modinst"),
a problem happens if you add a trailing slash only for modules_install.
$ make M=a/b/c modules
$ sudo make M=a/b/c/ modules_install
No module is installed in this case, Johannes Berg reported. [1]
Trim any trailing slashes from $(KBUILD_EXTMOD).
I used the 'dirname' command to remove all the trailing slashes in
case someone plays with a crazy directory path like M=a/b/c/////.
The Make's built-in function, $(dir ...) cannot take care of such
a case.
[1]: https://lore.kernel.org/lkml/10cc8522b27a051e6a9c3e158a4c4b6414fd04a0.camel@sipsolutions.net/
Fixes: ccae4cfa7bfb ("kbuild: refactor scripts/Makefile.modinst")
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile
index b79e0e8acbe3..6dabf3a1f635 100644
--- a/Makefile
+++ b/Makefile
@@ -129,6 +129,11 @@ endif
$(if $(word 2, $(KBUILD_EXTMOD)), \
$(error building multiple external modules is not supported))
+ifneq ($(KBUILD_EXTMOD),)
+# remove trailing slashes
+KBUILD_EXTMOD := $(shell dirname $(KBUILD_EXTMOD)/.)
+endif
+
export KBUILD_EXTMOD
# Kbuild will save output files in the current working directory.
--
2.27.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-02 9:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-02 9:52 [PATCH] kbuild: remove trailing slashes from $(KBUILD_EXTMOD) Masahiro Yamada
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 read-only IMAP folder(s) and NNTP newsgroup(s).