From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sun, 3 Feb 2008 06:12:13 +0000 (+0000)
Subject: Clean up OLDCONFIG logic and default to OLDCONFIG=yes. This is for bug 207895
X-Git-Tag: v3.4.10.902~167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f3bff37d121b5f7fc73288dec8233494a0bdea6;p=genkernel.git

Clean up OLDCONFIG logic and default to OLDCONFIG=yes. This is for bug 207895

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@585 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/ChangeLog b/ChangeLog
index 12671c4..5508ee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_configkernel.sh,
+  genkernel.conf:
+  Clean up OLDCONFIG logic and default to OLDCONFIG=yes. This is for bug 207895
+
   02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
   Moving the code to start resume operations so it doesn't run when booting
   from CD. We also don't execute the code if there's no real_resume set on the
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 24dcd4a..016d631 100644
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -44,14 +44,9 @@ config_kernel() {
 		print_info 1 '        Previous config backed up to .config.bak'
 		cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!'
 	fi
-	if isTrue "${CLEAN}" || isTrue "${OLDCONFIG}"
+	if isTrue "${OLDCONFIG}"
 	then
-		if ! isTrue "${CLEAN}"
-		then
-			print_info 1 'config: >> Running oldconfig...'
-		else
-			print_info 1 '        >> Running oldconfig...'
-		fi
+		print_info 1 '        >> Running oldconfig...'
 		yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null
 	fi
 	if isTrue "${CLEAN}"
diff --git a/genkernel.conf b/genkernel.conf
index 39f96a9..c61a398 100755
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -8,9 +8,7 @@
 # =========Common Command Line Option Defaults=========
 
 # Run 'make oldconfig' before compiling this kernel?
-# If set to "yes", also suppresses the fetch of the kernel .config file from
-# /etc/kernels, thus preserving the .config file in /usr/src/linux.
-# OLDCONFIG="no"
+OLDCONFIG="yes"
 
 # Run 'make menuconfig' before compiling this kernel?
 MENUCONFIG="no"