From 8f46a57adc671c1a48e52774a5bbbc0e9da33791 Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 4 Apr 2005 09:29:45 +0000 Subject: [PATCH] fake: linux config: defconfig may not be in the lxcpu subdir directly (like on ppc now). [2005031617320804194] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5836 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.conf | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index aa62915cd..4b56901f5 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -100,6 +100,15 @@ fi auto_config () { + case "$arch" in + powerpc) + defconfig="configs/common_defconfig" + ;; + *) + defconfig="defconfig" + ;; + esac + if [ -f $base/architecture/$arch/kernel$treever.conf.sh ] ; then echo " using: architecture/$arch/kernel$treever.conf.sh" . $base/architecture/$arch/kernel$treever.conf.sh > .config @@ -122,11 +131,11 @@ auto_config () cp $base/architecture/$arch/kernel.conf .config else echo " using: no rock kernel config found" - cp arch/$lx_cpu/defconfig .config + cp arch/$lx_cpu/$defconfig .config fi - echo " merging (system default): 'arch/$lx_cpu/defconfig'" - grep '^CONF.*=y' arch/$lx_cpu/defconfig | cut -f1 -d= | \ + echo " merging (system default): 'arch/$lx_cpu/$defconfig'" + grep '^CONF.*=y' arch/$lx_cpu/$defconfig | cut -f1 -d= | \ while read tag ; do egrep -q "(^| )$tag[= ]" .config || echo "$tag=y" done >> .config ; cp .config .config.1