Commit 891a9894 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: Create output directory in Makefile.modbuiltin
  kbuild: Generate modules.builtin in make modules
parents f1f6ea35 607b30fc

Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -1095,7 +1095,7 @@ all: modules 
#	using awk while concatenating to the final file.

#	using awk while concatenating to the final file.





PHONY += modules

PHONY += modules

modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)

modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin

	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order

	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order

	@$(kecho) '  Building modules, stage 2.';

	@$(kecho) '  Building modules, stage 2.';

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
@@ -1117,7 +1117,7 @@ PHONY += modules_install 
modules_install: _modinst_ _modinst_post

modules_install: _modinst_ _modinst_post





PHONY += _modinst_

PHONY += _modinst_

_modinst_: modules.builtin

_modinst_:

	@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \

	@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \

		echo "Warning: you may need to install module-init-tools"; \

		echo "Warning: you may need to install module-init-tools"; \

		echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\

		echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\

scripts/Makefile.modbuiltin

+5 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,11 @@ __modbuiltin: 




include scripts/Kbuild.include

include scripts/Kbuild.include





ifneq ($(KBUILD_SRC),)

# Create output directory if not already present

_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))

endif



# The filename Kbuild has precedence over Makefile

# The filename Kbuild has precedence over Makefile

kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))

kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))

kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)

kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)