Commit b3733034 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
  .gitignore: match ncscope.out
  scripts/ver_linux use 'gcc -dumpversion'
parents c8ff99a7 73531905

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ series 


# cscope files

cscope.*

ncscope.*



*.orig

*~

arch/x86/Kconfig

+3 −10
Original line number Diff line number Diff line
@@ -26,17 +26,10 @@ config X86 
	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_ARCH_KGDB if !X86_VOYAGER



config DEFCONFIG_LIST

config ARCH_DEFCONFIG

	string

	depends on X86_32

	option defconfig_list

	default "arch/x86/configs/i386_defconfig"



config DEFCONFIG_LIST

	string

	depends on X86_64

	option defconfig_list

	default "arch/x86/configs/x86_64_defconfig"

	default "arch/x86/configs/i386_defconfig" if X86_32

	default "arch/x86/configs/x86_64_defconfig" if X86_64





config GENERIC_LOCKBREAK

init/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config DEFCONFIG_LIST 
	default "/lib/modules/$UNAME_RELEASE/.config"

	default "/etc/kernel-config"

	default "/boot/config-$UNAME_RELEASE"

	default "$ARCH_DEFCONFIG"

	default "arch/$ARCH/defconfig"



menu "General setup"

scripts/ver_linux

+1 −4
Original line number Diff line number Diff line
@@ -12,12 +12,9 @@ echo ' ' 
uname -a

echo ' '



gcc --version 2>&1| head -n 1 | grep -v gcc | awk \

gcc -dumpversion 2>&1| awk \

'NR==1{print "Gnu C                 ", $1}'



gcc --version 2>&1| grep gcc | awk \

'NR==1{print "Gnu C                 ", $3}'



make --version 2>&1 | awk -F, '{print $1}' | awk \

      '/GNU Make/{print "Gnu make              ",$NF}'