aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2021-05-04 23:12:03 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-05 17:59:23 +0200
commitbee5c5450c3f7c6c07136b80f87365aea9353562 (patch)
tree1f98c16b5ec8117228ae74538d1508e599508d1a
parent3f50da76212263fff90603eb9e9bbcacfc86752b (diff)
downloadbackports-bee5c5450c3f7c6c07136b80f87365aea9353562.tar.gz
backports: suppress errors from 'make kernelversion'v5.10.42-1
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>
-rw-r--r--backport/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/backport/Makefile b/backport/Makefile
index ee7df4ba..77c2670d 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./')" ;\