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 12671c45c4f3f931c9e45bd19a7c605100b554e7..5508ee441da7766981b59c28344d8c8433388dba 100644 (file)
--- 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 24dcd4a16246ff87fddb995322995efced463d29..016d631fbb1c1be287b8a4cea87268b1eb3497b1 100644 (file)
--- 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 39f96a91244f128dcd36749124274a5097bb5104..c61a398fdb74df1e590db6dc660a996aa2ce7033 100755 (executable)
--- 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"