git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer_list: print relative expiry time signed
[safe/jmp/linux-2.6]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
8533f25
..
67cc457
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,8
+1,8
@@
VERSION = 2
PATCHLEVEL = 6
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 2
4
-EXTRAVERSION =
-NAME =
Arr Matey! A Hairy Bilge Rat!
+SUBLEVEL = 2
5
+EXTRAVERSION =
-rc2
+NAME =
Funky Weasel is Jiggy wit it
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
@@
-798,7
+798,7
@@
define rule_vmlinux-modpost
endef
# vmlinux image - including updated kernel symbols
endef
# vmlinux image - including updated kernel symbols
-vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main)
$(kallsyms.o) vmlinux.o
FORCE
+vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main)
vmlinux.o $(kallsyms.o)
FORCE
ifdef CONFIG_HEADERS_CHECK
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
endif
ifdef CONFIG_HEADERS_CHECK
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
endif
@@
-809,7
+809,9
@@
endif
$(call if_changed_rule,vmlinux__)
$(Q)rm -f .old_version
$(call if_changed_rule,vmlinux__)
$(Q)rm -f .old_version
-vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
+# build vmlinux.o first to catch section mismatch errors early
+$(kallsyms.o): vmlinux.o
+vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
$(call if_changed_rule,vmlinux-modpost)
# The actual objects are generated when descending,
$(call if_changed_rule,vmlinux-modpost)
# The actual objects are generated when descending,
@@
-1482,7
+1484,7
@@
kernelversion:
# Single targets
# ---------------------------------------------------------------------------
# Single targets are compatible with:
# Single targets
# ---------------------------------------------------------------------------
# Single targets are compatible with:
-# - build w
h
ith mixed source and output
+# - build with mixed source and output
# - build with separate output dir 'make O=...'
# - external modules
#
# - build with separate output dir 'make O=...'
# - external modules
#