The following commit has been merged in the linux branch: commit 25d591587d3b0676fb89c29e7e55fe4a08597ec1 Merge: 86ae13b006e48959981248493efd3ff4b2828b3d 2331d1a6cd3d6e580bc88b9a160066d9e1177fe1 Author: Linus Torvalds torvalds@linux-foundation.org Date: Tue Oct 13 10:20:53 2009 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kbuild: revert "save ARCH & CROSS_COMPILE ..." warn about use of uninstalled kernel headers kbuild: mkcompile_h: trivial cleanups kbuild: fix warning when domainname is not available kbuild: Fix size_append issue for bzip2/lzma kernel kbuild,scripts: use non-builtin echo for '-e' kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set
diff --combined Makefile index 927d7a3,8e5aaee..3267915 --- a/Makefile +++ b/Makefile @@@ -1,7 -1,7 +1,7 @@@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc4 NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION* @@@ -179,46 -179,9 +179,9 @@@ SUBARCH := $(shell uname -m | sed -e s/ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile - # - # To force ARCH and CROSS_COMPILE settings include kernel.* files - # in the kernel tree - do not patch this file. export KBUILD_BUILDHOST := $(SUBARCH) - - # Kbuild save the ARCH and CROSS_COMPILE setting in kernel.* files. - # Restore these settings and check that user did not specify - # conflicting values. - - saved_arch := $(shell cat include/generated/kernel.arch 2> /dev/null) - saved_cross := $(shell cat include/generated/kernel.cross 2> /dev/null) - - ifneq ($(CROSS_COMPILE),) - ifneq ($(saved_cross),) - ifneq ($(CROSS_COMPILE),$(saved_cross)) - $(error CROSS_COMPILE changed from \ - "$(saved_cross)" to \ - to "$(CROSS_COMPILE)". \ - Use "make mrproper" to fix it up) - endif - endif - else - CROSS_COMPILE := $(saved_cross) - endif - - ifneq ($(ARCH),) - ifneq ($(saved_arch),) - ifneq ($(saved_arch),$(ARCH)) - $(error ARCH changed from \ - "$(saved_arch)" to "$(ARCH)". \ - Use "make mrproper" to fix it up) - endif - endif - else - ifneq ($(saved_arch),) - ARCH := $(saved_arch) - else - ARCH := $(SUBARCH) - endif - endif + ARCH ?= $(SUBARCH) + CROSS_COMPILE ?=
# Architecture as present in compile.h UTS_MACHINE := $(ARCH) @@@ -483,11 -446,6 +446,6 @@@ ifeq ($(config-targets),1 include $(srctree)/arch/$(SRCARCH)/Makefile export KBUILD_DEFCONFIG KBUILD_KCONFIG
- # save ARCH & CROSS_COMPILE settings - $(shell mkdir -p include/generated && \ - echo $(ARCH) > include/generated/kernel.arch && \ - echo $(CROSS_COMPILE) > include/generated/kernel.cross) - config: scripts_basic outputmakefile FORCE $(Q)mkdir -p include/linux include/config $(Q)$(MAKE) $(build)=scripts/kconfig $@