提交 b3733034 编写于 作者: L Linus Torvalds

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'
......@@ -52,6 +52,7 @@ series
# cscope files
cscope.*
ncscope.*
*.orig
*~
......
......@@ -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
......
......@@ -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"
......
......@@ -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}'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册