Skip to contentSkip to conversation

kbuild: Stop modifying $(objtree)/Makefile when building oot-kmods oos

PATCH RESEND In review Nicolas Schier 2 participants 4 messages Jul 23 – Jul 25

Subsystems (2)
lore
Share & tools
lore

Nicolas Schier

author maintainer
#0 lore raw

PATCH RESEND 1/1 kbuild: Stop modifying $(objtree)/Makefile when building oot-kmods oos

From: Nicolas Schier <[email protected]>

Update output Makefile in the corresponding tree only: for out-of-source in-tree builds update $(objtree)/Makefile, for out-of-source out-of-tree module builds update $(KBUILD_EXTMOD_OUTPUT)/Makefile instead.

In-source builds are not affected.

Since commit c9bb03ac2c66 ("kbuild: reduce output spam when building out of tree"), building out-of-tree kernel modules out-of-source (make M=... MO=...) causes a rewrite of $(objtree)/Makefile with KBUILD_EXTMOD and KBUILD_EXTMOD_OUTPUT being set. That is problematic:

* $(objtree)/ must not be changed in any way when building out-of-tree modules as it breaks other uses of $(objtree).

* Setting KBUILD_EXTMOD and KBUILD_EXTMOD_OUTPUT in $(objtree)/Makefile kills the tree for incremental builds that start right there ('make -C $(objtree)'); builds starting in $(srctree) reset $(objtree)/Makefile to its original content.

Further, $(KBUILD_EXTMOD_OUTPUT)/Makefile was not generated any more at all.

This commit restores the previous kbuild behaviour prior to commit c9bb03ac2c66 ("kbuild: reduce output spam when building out of tree") but leaves in-place the use of filechk for output spam reduction.

---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
Makefile +3 -5
index 11539c3fd405..17d34968b7f0 100644
@@ -695,13 +695,11 @@ filechk_makefile = { \
 	echo "include $(abs_srctree)/Makefile"; \
 	}
 
-$(objtree)/Makefile: FORCE
+PHONY += $(CURDIR)/Makefile
+$(CURDIR)/Makefile: FORCE
 	$(call filechk,makefile)
 
-# Prevent $(srcroot)/Makefile from inhibiting the rule to run.
-PHONY += $(objtree)/Makefile
-
-outputmakefile: $(objtree)/Makefile
+outputmakefile: $(CURDIR)/Makefile
 ifeq ($(KBUILD_EXTMOD),)
 	@if [ -f $(srctree)/.config -o \
 		 -d $(srctree)/include/config -o \
Signature · 1 line
2.47.3
maintainer Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 26 lines

Update output Makefile in the corresponding tree only: for out-of-source in-tree builds update $(objtree)/Makefile, for out-of-source out-of-tree module builds update $(KBUILD_EXTMOD_OUTPUT)/Makefile instead.

In-source builds are not affected.

Since commit c9bb03ac2c66 ("kbuild: reduce output spam when building out of tree"), building out-of-tree kernel modules out-of-source (make M=... MO=...) causes a rewrite of $(objtree)/Makefile with KBUILD_EXTMOD and KBUILD_EXTMOD_OUTPUT being set. That is problematic:

* $(objtree)/ must not be changed in any way when building out-of-tree modules as it breaks other uses of $(objtree).

* Setting KBUILD_EXTMOD and KBUILD_EXTMOD_OUTPUT in $(objtree)/Makefile kills the tree for incremental builds that start right there ('make -C $(objtree)'); builds starting in $(srctree) reset $(objtree)/Makefile to its original content.

Further, $(KBUILD_EXTMOD_OUTPUT)/Makefile was not generated any more at all.

This commit restores the previous kbuild behaviour prior to commit c9bb03ac2c66 ("kbuild: reduce output spam when building out of tree") but leaves in-place the use of filechk for output spam reduction.

Quoted 8 lines

Thanks!

Do you want me to take this via kbuild-fixes?

Signature · 2 lines
Cheers,
Nathan
author maintainer
#2 lore raw
Quoted 35 lines · Nathan Chancellor
Quoted 26 lines

Update output Makefile in the corresponding tree only: for out-of-source in-tree builds update $(objtree)/Makefile, for out-of-source out-of-tree module builds update $(KBUILD_EXTMOD_OUTPUT)/Makefile instead.

In-source builds are not affected.

Since commit c9bb03ac2c66 ("kbuild: reduce output spam when building out of tree"), building out-of-tree kernel modules out-of-source (make M=... MO=...) causes a rewrite of $(objtree)/Makefile with KBUILD_EXTMOD and KBUILD_EXTMOD_OUTPUT being set. That is problematic:

* $(objtree)/ must not be changed in any way when building out-of-tree modules as it breaks other uses of $(objtree).

* Setting KBUILD_EXTMOD and KBUILD_EXTMOD_OUTPUT in $(objtree)/Makefile kills the tree for incremental builds that start right there ('make -C $(objtree)'); builds starting in $(srctree) reset $(objtree)/Makefile to its original content.

Further, $(KBUILD_EXTMOD_OUTPUT)/Makefile was not generated any more at all.

This commit restores the previous kbuild behaviour prior to commit c9bb03ac2c66 ("kbuild: reduce output spam when building out of tree") but leaves in-place the use of filechk for output spam reduction.

Quoted 8 lines
Quoted 6 lines

Thanks!

Do you want me to take this via kbuild-fixes?

Yes, please take it via kbuild-fixes, as it actually breaks build trees.

Thanks!

Signature · 1 line
Nicolas
#3 lore raw
In reply to Nicolas Schier
Quoted 1 line · Nicolas Schier

kbuild: Stop modifying $(objtree)/Makefile when building oot-kmods oos

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-fixes-unstable

Thanks!

[1/1] kbuild: Stop modifying $(objtree)/Makefile when building oot-kmods oos

      https://git.kernel.org/kbuild/c/39d6e68f50f4a

Please look out for regression or issue reports or other follow up comments, as they may result in the patch/series getting dropped or reverted. Patches applied to an "unstable" branch are accepted pending wider testing in -next and any post-commit review; they will generally be moved to the main branch in a week if no issues are found.

Best regards,

Signature · 2 lines
Cheers,
Nathan