diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-25 15:00:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-25 15:00:27 -0700 |
| commit | b3733034f113a4119f734b84e94180a42c8bc1a1 (patch) | |
| tree | d9eaf50e02a3043ca00a48a99d05d619e76cf6c3 | |
| parent | c8ff99a7c2fb23a0f1165f3821fd66fd65f30264 (diff) | |
| parent | 73531905ed53576d9e8707659a761e7046a60497 (diff) | |
| download | op-kernel-dev-b3733034f113a4119f734b84e94180a42c8bc1a1.zip op-kernel-dev-b3733034f113a4119f734b84e94180a42c8bc1a1.tar.gz | |
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'
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 13 | ||||
| -rw-r--r-- | init/Kconfig | 1 | ||||
| -rwxr-xr-x | scripts/ver_linux | 5 |
4 files changed, 6 insertions, 14 deletions
@@ -52,6 +52,7 @@ series # cscope files cscope.* +ncscope.* *.orig *~ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae..dcbec34 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -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 diff --git a/init/Kconfig b/init/Kconfig index 6135d07..6199d11 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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" diff --git a/scripts/ver_linux b/scripts/ver_linux index ab69ece..7ac0e30 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -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}' |
