aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-03-10 06:28:58 -0500
committerMichal Marek <mmarek@suse.cz>2010-03-10 06:31:06 -0500
commit73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe (patch)
tree5febaffdd061ec155e370a08be5c5db3152a9434
parente93bc1a0cab3e54e3c1947e01c8e73892e35630d (diff)
kbuild: Generate modules.builtin in make modules_install
The previous approach didn't work if one did make modules && make modules_install Add modules.builtin as dependency of _modinst_, which is the target that actually needs the file. Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 160cadadc471..b98943a466c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1086,7 +1086,7 @@ ifdef CONFIG_MODULES
1086 1086
1087# By default, build modules as well 1087# By default, build modules as well
1088 1088
1089all: modules modules.builtin 1089all: modules
1090 1090
1091# Build modules 1091# Build modules
1092# 1092#
@@ -1104,7 +1104,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
1104modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) 1104modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
1105 $(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin 1105 $(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
1106 1106
1107%/modules.builtin: include/config/auto.conf | modules 1107%/modules.builtin: include/config/auto.conf
1108 $(Q)$(MAKE) $(modbuiltin)=$* 1108 $(Q)$(MAKE) $(modbuiltin)=$*
1109 1109
1110 1110
@@ -1117,7 +1117,7 @@ PHONY += modules_install
1117modules_install: _modinst_ _modinst_post 1117modules_install: _modinst_ _modinst_post
1118 1118
1119PHONY += _modinst_ 1119PHONY += _modinst_
1120_modinst_: 1120_modinst_: modules.builtin
1121 @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \ 1121 @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
1122 echo "Warning: you may need to install module-init-tools"; \ 1122 echo "Warning: you may need to install module-init-tools"; \
1123 echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ 1123 echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\