diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 14 | 3 | SUBLEVEL = 14 |
4 | EXTRAVERSION =-rc1 | 4 | EXTRAVERSION =-rc5 |
5 | NAME=Affluent Albatross | 5 | NAME=Affluent Albatross |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
@@ -372,7 +372,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve | |||
372 | # Files to ignore in find ... statements | 372 | # Files to ignore in find ... statements |
373 | 373 | ||
374 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o | 374 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o |
375 | RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg | 375 | export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg |
376 | 376 | ||
377 | # =========================================================================== | 377 | # =========================================================================== |
378 | # Rules shared between *config targets and build targets | 378 | # Rules shared between *config targets and build targets |
@@ -660,8 +660,10 @@ quiet_cmd_sysmap = SYSMAP | |||
660 | # Link of vmlinux | 660 | # Link of vmlinux |
661 | # If CONFIG_KALLSYMS is set .version is already updated | 661 | # If CONFIG_KALLSYMS is set .version is already updated |
662 | # Generate System.map and verify that the content is consistent | 662 | # Generate System.map and verify that the content is consistent |
663 | 663 | # Use + in front of the vmlinux_version rule to silent warning with make -j2 | |
664 | # First command is ':' to allow us to use + in front of the rule | ||
664 | define rule_vmlinux__ | 665 | define rule_vmlinux__ |
666 | : | ||
665 | $(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version)) | 667 | $(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version)) |
666 | 668 | ||
667 | $(call cmd,vmlinux__) | 669 | $(call cmd,vmlinux__) |