diff mbox series

[v2] backports: suppress errors from 'make kernelversion'

Message ID 20210504231203.d7b5b5ce71f7.I3aace2170f657561190f0473f2affafc850559b3@changeid (mailing list archive)
State New, archived
Headers show
Series [v2] backports: suppress errors from 'make kernelversion' | expand

Commit Message

Johannes Berg May 4, 2021, 9:12 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

Since kernel 5.8, specifically commit 4d0831e8a029 ("kconfig: unify
cc-option and as-option"), 'make kernelversion' will call into the
Kconfig system, evaluating cc-option from scripts/Kconfig.include,
which requires a writable current working directory due to the use
of ".tmp_<pid>" for temporary files.

This was fixed upstream in commit 805b2e1d427a ("kbuild: include
Makefile.compiler only when compiler is needed").

To work around it, pass M= as suggested here:
https://lore.kernel.org/r/CAK7LNAROdVMPQq4Qn_M=OWzJrfqNOc4fyMicNKdnCqu7G9rFgw@mail.gmail.com

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 backport/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/backport/Makefile b/backport/Makefile
index ee7df4ba29ce..77c2670d637e 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -84,8 +84,8 @@  mrproper:
 				echo ""							;\
 			done								\
 		) > Kconfig.kernel							;\
-		kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |	\
-			sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d')		;\
+		kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) M=$(BACKPORT_DIR)	\
+			kernelversion |	sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\
 		test "$$kver" != "" || echo "Kernel version parse failed!"		;\
 		test "$$kver" != ""							;\
 		kvers="$$(seq 14 39 | sed 's/^/2.6./')"					;\