Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35441
b: refs/heads/master
c: 12715d2
h: refs/heads/master
i:
  35439: f249cfb
v: v3
  • Loading branch information
Sam Ravnborg authored and Sam Ravnborg committed Sep 25, 2006
1 parent 39d4eff commit 2769766
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9e157a5aa899f1ef73780e4755b57ddeb9225079
refs/heads/master: 12715d20af9fd9179daca7a1cd2cf3db3c2c494f
1 change: 1 addition & 0 deletions trunk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@ endif # ifdef CONFIG_KALLSYMS
# vmlinux image - including updated kernel symbols
vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
$(call if_changed_rule,vmlinux__)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
$(Q)rm -f .old_version

# The actual objects are generated when descending,
Expand Down
2 changes: 1 addition & 1 deletion trunk/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ always := $(hostprogs-y)
hostprogs-y += unifdef

subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_MODULES) += mod
subdir-y += mod

# Let clean descend into subdirs
subdir- += basic kconfig package
12 changes: 9 additions & 3 deletions trunk/scripts/Makefile.modpost
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,25 @@ _modpost: $(modules)

# Step 2), invoke modpost
# Includes step 3,4
quiet_cmd_modpost = MODPOST
quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
cmd_modpost = scripts/mod/modpost \
$(if $(CONFIG_MODVERSIONS),-m) \
$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,) \
$(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
$(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
$(filter-out FORCE,$^)
$(wildcard vmlinux) $(filter-out FORCE,$^)

PHONY += __modpost
__modpost: $(wildcard vmlinux) $(modules:.ko=.o) FORCE
__modpost: $(modules:.ko=.o) FORCE
$(call cmd,modpost)

quiet_cmd_kernel-mod = MODPOST $@
cmd_kernel-mod = $(cmd_modpost)

vmlinux: FORCE
$(call cmd,kernel-mod)

# Declare generated files as targets for modpost
$(symverfile): __modpost ;
$(modules:.ko=.mod.c): __modpost ;
Expand Down

0 comments on commit 2769766

Please sign in to comment.