diff options
author | Michal Marek <mmarek@suse.cz> | 2010-06-07 16:22:12 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-06-09 16:40:05 -0400 |
commit | 2da30e703c5a56e27249fa8b8607708123fa52f5 (patch) | |
tree | 9dfaccf37761e5a6a39c8841d3cca79b612975d2 | |
parent | 63a07cb64ccc3ceae619d3298545d602ab5ecd38 (diff) |
kbuild: Generate modules.builtin in make modules
Generating the file in make modules_install was broken as well, because
it didn't work in a readonly filesystem and otherwise it generated a
root-owned file which is not wanted.
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1095,7 +1095,7 @@ all: modules | |||
1095 | # using awk while concatenating to the final file. | 1095 | # using awk while concatenating to the final file. |
1096 | 1096 | ||
1097 | PHONY += modules | 1097 | PHONY += modules |
1098 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) | 1098 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin |
1099 | $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order | 1099 | $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order |
1100 | @$(kecho) ' Building modules, stage 2.'; | 1100 | @$(kecho) ' Building modules, stage 2.'; |
1101 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost | 1101 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
@@ -1117,7 +1117,7 @@ PHONY += modules_install | |||
1117 | modules_install: _modinst_ _modinst_post | 1117 | modules_install: _modinst_ _modinst_post |
1118 | 1118 | ||
1119 | PHONY += _modinst_ | 1119 | PHONY += _modinst_ |
1120 | _modinst_: modules.builtin | 1120 | _modinst_: |
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";\ |