From 9c2d3acc7e4612d50046ff42e9a30a8c1d5f42fb Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 20 Jan 2011 01:53:37 +0100
Subject: [PATCH] Move application of kernel config after "make mrproper" as
 that deletes .config (whereas "make clean" does not) (bug #351906)

---
 ChangeLog           |  4 ++++
 gen_configkernel.sh | 11 +++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d31869..686fcc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh:
+  Move application of kernel config after "make mrproper" as that deletes
+  .config (whereas "make clean" does not) (bug #351906)
+
   16 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.11
 
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index e5aa023..f4db0e3 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -29,8 +29,8 @@ config_kernel() {
 	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
-	# Backup and replace kernel .config
-	if isTrue "${CLEAN}" || [ ! -f "${KERNEL_DIR}/.config" ]
+	# Backup current kernel .config
+	if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
 	then
 		print_info 1 "config: Using config from ${KERNEL_CONFIG}"
 		if [ -f "${KERNEL_DIR}/.config" ]
@@ -40,7 +40,6 @@ config_kernel() {
 					|| gen_die "Could not backup kernel config (${KERNEL_DIR}/.config)"
 			print_info 1 "        Previous config backed up to .config${NOW}.bak"
 		fi
-		cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!'
 	fi
 
 	if isTrue ${MRPROPER}
@@ -51,8 +50,12 @@ config_kernel() {
 		print_info 1 "config: --no-mrproper is enabled; not running 'make mrproper'."
 	fi
 
-	# If we're not cleaning, then we don't want to try to overwrite the configs
+	# If we're not cleaning a la mrproper, then we don't want to try to overwrite the configs
 	# or we might remove configurations someone is trying to test.
+	if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
+	then
+		cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!'
+	fi
 
 	if isTrue "${OLDCONFIG}"
 	then