[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210810173003.020042754@linuxfoundation.org>
Date: Tue, 10 Aug 2021 19:29:31 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, John S Gruber <johnsgruber@...il.com>,
Masahiro Yamada <masahiroy@...nel.org>,
Sasha Levin <sashal@...nel.org>
Subject: [PATCH 5.13 063/175] kbuild: cancel sub_make_done for the install target to fix DKMS
From: Masahiro Yamada <masahiroy@...nel.org>
[ Upstream commit 14ccc638b02f9ec500c17d9e39efe979145a4b61 ]
Since commit bcf637f54f6d ("kbuild: parse C= and M= before changing the
working directory"), external module builds invoked by DKMS fail because
M= option is not parsed.
I wanted to add 'unset sub_make_done' in install.sh but similar scripts,
arch/*/boot/install.sh, are duplicated, so I set sub_make_done empty in
the top Makefile.
Fixes: bcf637f54f6d ("kbuild: parse C= and M= before changing the working directory")
Reported-by: John S Gruber <johnsgruber@...il.com>
Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
Tested-by: John S Gruber <johnsgruber@...il.com>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
Makefile | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Makefile b/Makefile
index 9d810e13a83f..218f44d7fc80 100644
--- a/Makefile
+++ b/Makefile
@@ -1366,6 +1366,15 @@ scripts_unifdef: scripts_basic
$(Q)$(MAKE) $(build)=scripts scripts/unifdef
# ---------------------------------------------------------------------------
+# Install
+
+# Many distributions have the custom install script, /sbin/installkernel.
+# If DKMS is installed, 'make install' will eventually recuses back
+# to the this Makefile to build and install external modules.
+# Cancel sub_make_done so that options such as M=, V=, etc. are parsed.
+
+install: sub_make_done :=
+
# Kernel selftest
PHONY += kselftest
--
2.30.2
Powered by blists - more mailing lists