kbuild: fix single target build for external module

BugLink: https://bugs.launchpad.net/bugs/1857158
[ Upstream commit e07db28eea38ed4e332b3a89f3995c86b713cb5b ]

Building a single target in an external module fails due to missing
.tmp_versions directory.

For example,

  $ make -C /lib/modules/$(uname -r)/build M=$PWD foo.o

will fail in the following way:

  CC [M]  /home/masahiro/foo/foo.o
/bin/sh: 1: cannot create /home/masahiro/foo/.tmp_versions/foo.mod: Directory nonexistent

This is because $(cmd_crmodverdir) is executed only before building
/, %/, %.ko single targets of external modules. Create .tmp_versions
in the 'prepare' target.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/Makefile b/Makefile
index 9f0c7b54e053e708247910cce8377f194cdad488..b206508710e0dd950526d47c2d471b07d8442686 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1562,9 +1562,6 @@ else # KBUILD_EXTMOD
 
 # We are always building modules
 KBUILD_MODULES := 1
 
 # We are always building modules
 KBUILD_MODULES := 1

-PHONY += crmodverdir
-crmodverdir:
-       $(cmd_crmodverdir)

 
 PHONY += $(objtree)/Module.symvers
 $(objtree)/Module.symvers:
 
 PHONY += $(objtree)/Module.symvers
 $(objtree)/Module.symvers:


@@ -1576,7 +1573,7 @@ $(objtree)/Module.symvers:
 
 module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD))
 PHONY += $(module-dirs) modules
 
 module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD))
 PHONY += $(module-dirs) modules

-$(module-dirs): crmodverdir $(objtree)/Module.symvers
+$(module-dirs): prepare $(objtree)/Module.symvers

        $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
 
 modules: $(module-dirs)
        $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
 
 modules: $(module-dirs)


@@ -1617,7 +1614,8 @@ help:
 
 # Dummies...
 PHONY += prepare scripts
 
 # Dummies...
 PHONY += prepare scripts

-prepare: ;
+prepare:
+       $(cmd_crmodverdir)

 scripts: ;
 endif # KBUILD_EXTMOD
 
 scripts: ;
 endif # KBUILD_EXTMOD
 


@@ -1743,17 +1741,14 @@ endif
 
 # Modules
 /: prepare scripts FORCE
 
 # Modules
 /: prepare scripts FORCE

-       $(cmd_crmodverdir)

        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
 # Make sure the latest headers are built for Documentation
 Documentation/ samples/: headers_install
 %/: prepare scripts FORCE
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
 # Make sure the latest headers are built for Documentation
 Documentation/ samples/: headers_install
 %/: prepare scripts FORCE

-       $(cmd_crmodverdir)

        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
 %.ko: prepare scripts FORCE
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
 %.ko: prepare scripts FORCE

-       $(cmd_crmodverdir)

        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
        $(build)=$(build-dir) $(@:.ko=.o)
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
        $(build)=$(build-dir) $(@:.ko=.o)
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost