Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a865c06 authored Dec 17, 2009 by Linus Torvalds

Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

* 'for-33' of git://repo.or.cz/linux-kbuild: (29 commits)
  net: fix for utsrelease.h moving to generated
  gen_init_cpio: fixed fwrite warning
  kbuild: fix make clean after mismerge
  kbuild: generate modules.builtin
  genksyms: properly consider  EXPORT_UNUSED_SYMBOL{,_GPL}()
  score: add asm/asm-offsets.h wrapper
  unifdef: update to upstream revision 1.190
  kbuild: specify absolute paths for cscope
  kbuild: create include/generated in silentoldconfig
  scripts/package: deb-pkg: use fakeroot if available
  scripts/package: add KBUILD_PKG_ROOTCMD variable
  scripts/package: tar-pkg: use tar --owner=root
  Kbuild: clean up marker
  net: add net_tstamp.h to headers_install
  kbuild: move utsrelease.h to include/generated
  kbuild: move autoconf.h to include/generated
  drop explicit include of autoconf.h
  kbuild: move compile.h to include/generated
  kbuild: drop include/asm
  kbuild: do not check for include/asm-$ARCH
  ...

Fixed non-conflicting clean merge of modpost.c as per comments from
Stephen Rothwell (modpost.c had grown an include of linux/autoconf.h
that needed to be changed to generated/autoconf.h)

parents 331d9d59 46e75f66

.gitignore

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	*.lst		*.lst
	*.symtypes		*.symtypes
	*.order		*.order
			modules.builtin
	*.elf		*.elf
	*.bin		*.bin
	*.gz		*.gz
	@@ -45,14 +46,8 @@ Module.symvers
	#		#
	# Generated include files		# Generated include files
	#		#
	include/asm
	include/asm-*/asm-offsets.h
	include/config		include/config
	include/linux/autoconf.h
	include/linux/compile.h
	include/linux/version.h		include/linux/version.h
	include/linux/utsrelease.h
	include/linux/bounds.h
	include/generated		include/generated

	# stgit generated dirs		# stgit generated dirs

Documentation/dontdiff

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -103,6 +103,7 @@ gconf
	gen-devlist		gen-devlist
	gen_crc32table		gen_crc32table
	gen_init_cpio		gen_init_cpio
			generated
	genheaders		genheaders
	genksyms		genksyms
	*_gray256.c		*_gray256.c

Documentation/kbuild/kbuild.txt

+14 −0

Original line number	Original line	Diff line number	Diff line
			Output files

			modules.order
			--------------------------------------------------
			This file records the order in which modules appear in Makefiles. This
			is used by modprobe to deterministically resolve aliases that match
			multiple modules.

			modules.builtin
			--------------------------------------------------
			This file lists all modules that are built into the kernel. This is used
			by modprobe to not fail when trying to load something builtin.


	Environment variables		Environment variables

	KCPPFLAGS		KCPPFLAGS

Documentation/kbuild/kconfig.txt

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,10 +103,16 @@ KCONFIG_AUTOCONFIG
	This environment variable can be set to specify the path & name of the		This environment variable can be set to specify the path & name of the
	"auto.conf" file. Its default value is "include/config/auto.conf".		"auto.conf" file. Its default value is "include/config/auto.conf".

			KCONFIG_TRISTATE
			--------------------------------------------------
			This environment variable can be set to specify the path & name of the
			"tristate.conf" file. Its default value is "include/config/tristate.conf".

	KCONFIG_AUTOHEADER		KCONFIG_AUTOHEADER
	--------------------------------------------------		--------------------------------------------------
	This environment variable can be set to specify the path & name of the		This environment variable can be set to specify the path & name of the
	"autoconf.h" (header) file. Its default value is "include/linux/autoconf.h".		"autoconf.h" (header) file.
			Its default value is "include/generated/autoconf.h".


	======================================================================		======================================================================

Kbuild

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@
	#####		#####
	# 1) Generate bounds.h		# 1) Generate bounds.h

	bounds-file := include/linux/bounds.h		bounds-file := include/generated/bounds.h

	always := $(bounds-file)		always := $(bounds-file)
	targets := $(bounds-file) kernel/bounds.s		targets := $(bounds-file) kernel/bounds.s
	@@ -43,7 +43,7 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild
	# 2) Generate asm-offsets.h		# 2) Generate asm-offsets.h
	#		#

	offsets-file := include/asm/asm-offsets.h		offsets-file := include/generated/asm-offsets.h

	always += $(offsets-file)		always += $(offsets-file)
	targets += $(offsets-file)		targets += $(offsets-file)