From: Masahiro Yamada masahiroy@kernel.org
[ Upstream commit f110e5a250e3c5db417e094b3dd86f1c135291ca ]
Remove the potentially invalid modules.order instead of using the temporary file.
Also, KBUILD_MODULES is don't care for single builds. No need to cancel it.
Signed-off-by: Masahiro Yamada masahiroy@kernel.org Stable-dep-of: c7b98de745cf ("phy: qcom-qmp-combo: fix runtime suspend") Signed-off-by: Sasha Levin sashal@kernel.org --- Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile index e32d3137b1d9..36aff1531386 100644 --- a/Makefile +++ b/Makefile @@ -1766,6 +1766,8 @@ modules modules_install: @echo >&2 '***' @exit 1
+KBUILD_MODULES := + endif # CONFIG_MODULES
# Single targets @@ -1791,18 +1793,12 @@ $(single-ko): single_modpost $(single-no-ko): descend @:
-ifeq ($(KBUILD_EXTMOD),) -# For the single build of in-tree modules, use a temporary file to avoid -# the situation of modules_install installing an invalid modules.order. -MODORDER := .modules.tmp -endif - +# Remove MODORDER when done because it is not the real one. PHONY += single_modpost single_modpost: $(single-no-ko) modules_prepare $(Q){ $(foreach m, $(single-ko), echo $(extmod-prefix)$m;) } > $(MODORDER) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost - -KBUILD_MODULES := 1 + $(Q)rm -f $(MODORDER)
export KBUILD_SINGLE_TARGETS := $(addprefix $(extmod-prefix), $(single-no-ko))
@@ -1812,10 +1808,6 @@ build-dirs := $(foreach d, $(build-dirs), \
endif
-ifndef CONFIG_MODULES -KBUILD_MODULES := -endif - # Handle descending into subdirectories listed in $(build-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running