aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2006-04-05 17:33:50 -0400
committerSam Ravnborg <sam@mars.ravnborg.org>2006-04-06 02:42:17 -0400
commit7d2d8fe0cb88914d26219db51341d780a032b198 (patch)
tree200b98483aabc4c27d167a10b9903077307b9009
parentaa360879ed38fbe88057cc43f720881ab9e6a63a (diff)
kbuild: modules_install for external modules must not remove existing modules
When installing external modules with `make modules_install', the first thing that happens is a rm -rf of the target directory. This works only once, and breaks when installing more than one (set of) external module(s). With following fix we have the functionality: - for a in-kernel modules_install the $(MODLIB)/kernel directory will be deleted before module installation - for external modules the existing modules will be left as is assuming one may be building and installign several external modules Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c380f5891f4f..fc8e08c419f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1112,7 +1112,6 @@ modules_install: _emodinst_ _emodinst_post
1112install-dir := $(if $(INSTALL_MOD_DIR),$(INSTALL_MOD_DIR),extra) 1112install-dir := $(if $(INSTALL_MOD_DIR),$(INSTALL_MOD_DIR),extra)
1113PHONY += _emodinst_ 1113PHONY += _emodinst_
1114_emodinst_: 1114_emodinst_:
1115 $(Q)rm -rf $(MODLIB)/$(install-dir)
1116 $(Q)mkdir -p $(MODLIB)/$(install-dir) 1115 $(Q)mkdir -p $(MODLIB)/$(install-dir)
1117 $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst 1116 $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst
1118 1117