kbuild: support building individual files for external modules
PATCH 1/1 kbuild: support building individual files for external modules
Following patch implement support for building individual files when dealing with separate modules.
So say you have a module named "foo" wich consist of two .o files bar.o and fun.o.
You can then do
make -C $KERNELSRC M=pwd bar.o
make -C $KERNELSRC M=pwd bar.lst
make -C $KERNELSRC M=pwd bar.i
make -C $KERNELSRC M=pwd / <= will build all .o files
make -C $KERNELSRC M=pwd foo.ko <= will build the module
and do the modpost step
The above will also work if the external module is placed in a subdirectory using a hirachy of kbuild files.
Thanks to Andreas Gruenbacher <[email protected]> for initial feature request / bug report.
Sam
Makefile +45 -22
@@ -138,7 +138,7 @@ objtree := $(CURDIR) src := $(srctree) obj := $(objtree) -VPATH := $(srctree) +VPATH := $(srctree):$(KBUILD_EXTMOD) export srctree objtree VPATH TOPDIR
@@ -818,27 +818,6 @@ prepare prepare-all: prepare0 export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) -# Single targets -# --------------------------------------------------------------------------- - -%.s: %.c scripts FORCE - $(Q)$(MAKE) $(build)=$(@D) $@ -%.i: %.c scripts FORCE - $(Q)$(MAKE) $(build)=$(@D) $@ -%.o: %.c scripts FORCE - $(Q)$(MAKE) $(build)=$(@D) $@ -%.ko: scripts FORCE - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D) $(@:.ko=.o) - $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost -%/: scripts prepare FORCE - $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) $(build)=$(@D) -%.lst: %.c scripts FORCE - $(Q)$(MAKE) $(build)=$(@D) $@ -%.s: %.S scripts FORCE - $(Q)$(MAKE) $(build)=$(@D) $@ -%.o: %.S scripts FORCE - $(Q)$(MAKE) $(build)=$(@D) $@ - # FIXME: The asm symlink changes when $(ARCH) changes. That's # hard to detect, but I suppose "make mrproper" is a good idea # before switching between archs anyway.
@@ -1161,6 +1140,11 @@ help: @echo ' modules_install - install the module' @echo ' clean - remove generated files in module directory only' @echo '' + +# Dummies... +.PHONY: prepare scripts +prepare: ; +scripts: ; endif # KBUILD_EXTMOD # Generate tags for editors
@@ -1282,6 +1266,44 @@ kernelrelease: kernelversion: @echo $(KERNELVERSION) +# Single targets +# --------------------------------------------------------------------------- +# The directory part is taken from first prerequisite, so this +# works even with external modules +%.s: %.c scripts FORCE + $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@) +%.i: %.c scripts FORCE + $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@) +%.o: %.c scripts FORCE + $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@) +%.lst: %.c scripts FORCE + $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@) +%.s: %.S scripts FORCE + $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@) +%.o: %.S scripts FORCE + $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@) + +# For external modules we shall include any directory of the target, +# but usual case there is no directory part. +# make M=`pwd` module.o => $(dir $@)=./ +# make M=`pwd` foo/module.o => $(dir $@)=foo/ +# make M=`pwd` / => $(dir $@)=/ + +ifeq ($(KBUILD_EXTMOD),) + target-dir = $(@D) +else + zap-slash=$(filter-out .,$(patsubst %/,%,$(dir $@))) + target-dir = $(KBUILD_EXTMOD)$(if $(zap-slash),/$(zap-slash)) +endif + +/ %/: scripts prepare FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(target-dir) +%.ko: scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(target-dir) $(@:.ko=.o) + $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost + # FIXME Should go into a make.lib or something # ===========================================================================
@@ -1316,4 +1338,5 @@ clean := -f $(if $(KBUILD_SRC),$(srctree endif # skip-makefile +.PHONY: FORCE FORCE:
Quoted 2 lines · Sam Ravnborg
Following patch implement support for building individual files when dealing with separate modules.
Lightly tested with a separate O= and M= directory and a copy of the entire fs/ tree; all seems to work for me. The only issue I had was with fs/xfs/Kbuild, which reads:
[] include $(srctree)/$(obj)/Makefile-linux-2.6
This should get changed as below to work equally well in and out of the tree:
[] include $(src)/Makefile-linux-2.6
Quoted 1 line
make -C $KERNELSRC M=
pwdbar.lst
That's what triggered the bug report for me: people expect those targets to work also for external modules, and the patch fixes them. Thank you very much, Sam!
Andreas