Skip to content

Commit 14ccc63

Browse files
committed
kbuild: cancel sub_make_done for the install target to fix DKMS
Since commit bcf637f ("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: bcf637f ("kbuild: parse C= and M= before changing the working directory") Reported-by: John S Gruber <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]> Tested-by: John S Gruber <[email protected]>
1 parent 54eacba commit 14ccc63

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,16 @@ PHONY += scripts_unifdef
13171317
scripts_unifdef: scripts_basic
13181318
$(Q)$(MAKE) $(build)=scripts scripts/unifdef
13191319

1320+
# ---------------------------------------------------------------------------
1321+
# Install
1322+
1323+
# Many distributions have the custom install script, /sbin/installkernel.
1324+
# If DKMS is installed, 'make install' will eventually recuses back
1325+
# to the this Makefile to build and install external modules.
1326+
# Cancel sub_make_done so that options such as M=, V=, etc. are parsed.
1327+
1328+
install: sub_make_done :=
1329+
13201330
# ---------------------------------------------------------------------------
13211331
# Tools
13221332

0 commit comments

Comments
 (0)