From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Aug 2010 00:57:56 +0000 (-0700)
Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v2.6.36-rc1~29
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=9a459f6812fc26e0eb24bbe9c388000e23f67f6b;hp=-c;p=net-next-2.6.git

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

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  setlocalversion: fix version for untaged nontip mercurial revs
  Fix CONFIG_CROSS_COMPILE issue in .config
---

9a459f6812fc26e0eb24bbe9c388000e23f67f6b
diff --combined Makefile
index 7431c283f15,f78450e299a..788111d2155
--- a/Makefile
+++ b/Makefile
@@@ -189,7 -189,6 +189,6 @@@ SUBARCH := $(shell uname -m | sed -e s/
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH		?= $(SUBARCH)
- CROSS_COMPILE	?=
  CROSS_COMPILE	?= $(CONFIG_CROSS_COMPILE:"%"=%)
  
  # Architecture as present in compile.h
@@@ -418,9 -417,9 +417,9 @@@ endi
  # of make so .config is not included in this case either (for *config).
  
  no-dot-config-targets := clean mrproper distclean \
 -			 cscope TAGS tags help %docs check% \
 +			 cscope TAGS tags help %docs check% coccicheck \
  			 include/linux/version.h headers_% \
 -			 kernelversion
 +			 kernelversion %src-pkg
  
  config-targets := 0
  mixed-targets  := 0
@@@ -532,7 -531,7 +531,7 @@@ endif # $(dot-config
  # The all: target is the default when no target is given on the
  # command line.
  # This allow a user to issue only 'make' to build a kernel including modules
 -# Defaults vmlinux but it is usually overridden in the arch makefile
 +# Defaults to vmlinux, but the arch makefile usually adds further targets
  all: vmlinux
  
  ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@@ -1168,8 -1167,6 +1167,8 @@@ distclean: mrprope
  # rpm target kept for backward compatibility
  package-dir	:= $(srctree)/scripts/package
  
 +%src-pkg: FORCE
 +	$(Q)$(MAKE) $(build)=$(package-dir) $@
  %pkg: include/config/kernel.release FORCE
  	$(Q)$(MAKE) $(build)=$(package-dir) $@
  rpm: include/config/kernel.release FORCE
@@@ -1221,9 -1218,8 +1220,9 @@@ help
  	@echo  '  includecheck    - Check for duplicate included header files'
  	@echo  '  export_report   - List the usages of all exported symbols'
  	@echo  '  headers_check   - Sanity check on exported headers'
 -	@echo  '  headerdep       - Detect inclusion cycles in headers'; \
 -	 echo  ''
 +	@echo  '  headerdep       - Detect inclusion cycles in headers'
 +	@$(MAKE) -f $(srctree)/scripts/Makefile.help checker-help
 +	@echo  ''
  	@echo  'Kernel packaging:'
  	@$(MAKE) $(build)=$(package-dir) help
  	@echo  ''
@@@ -1382,9 -1378,6 +1381,9 @@@ versioncheck
  		-name '*.[hcS]' -type f -print | sort \
  		| xargs $(PERL) -w $(srctree)/scripts/checkversion.pl
  
 +coccicheck:
 +	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/$@
 +
  namespacecheck:
  	$(PERL) $(srctree)/scripts/namespace.pl