diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-10-22 05:23:07 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2007-10-22 14:04:37 -0400 |
commit | ab19f8794a66910ef9b33041ccfa05b6b12ab6c9 (patch) | |
tree | cf1b5f6df7447b0655fd649b88b231190706aab5 | |
parent | 437374e9a95062fe310b901e48585691edaf5dd0 (diff) |
kbuild: fix modules_install after a 'make vmlinux'
make vmlinux would delete the content of $(MODVERDIR)
equals .tmp_versions. This caused a subsequent
make modules_install to fail.
Fix it so we clean the directory only for the
modules build - but we still unconditionally create it so
we can do:
make dir/file.ko
without a preceeding make modules.
Reported by David Miller <davem@davemloft.net>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: David Miller <davem@davemloft.net>
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1512,8 +1512,9 @@ quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) | |||
1512 | fi | 1512 | fi |
1513 | 1513 | ||
1514 | # Create temporary dir for module support files | 1514 | # Create temporary dir for module support files |
1515 | cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR); rm -f $(MODVERDIR)/* | 1515 | # clean it up only when building all modules |
1516 | 1516 | cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \ | |
1517 | $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*) | ||
1517 | 1518 | ||
1518 | a_flags = -Wp,-MD,$(depfile) $(KBUILD_AFLAGS) $(AFLAGS_KERNEL) \ | 1519 | a_flags = -Wp,-MD,$(depfile) $(KBUILD_AFLAGS) $(AFLAGS_KERNEL) \ |
1519 | $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) \ | 1520 | $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) \ |