From 5b65297cef481cbbccc803152b6c05d101169ead Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Fri, 7 Jan 2011 16:40:18 -0500
Subject: [PATCH] Add support for local rebuild config option overrides

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 config-local |  2 ++
 kernel.spec  | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 config-local

diff --git a/config-local b/config-local
new file mode 100644
index 000000000..8c32be5be
--- /dev/null
+++ b/config-local
@@ -0,0 +1,2 @@
+# This file is intentionally left empty in the stock kernel. Its a nicety
+# added for those wanting to do custom rebuilds with altered config opts.
diff --git a/kernel.spec b/kernel.spec
index cb2cf6fe6..3a4a24999 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -546,6 +546,10 @@ Source90: config-sparc64-generic
 
 Source100: config-arm
 
+# This file is intentionally left empty in the stock kernel. Its a nicety
+# added for those wanting to do custom rebuilds with altered config opts.
+Source1000: config-local
+
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel
@@ -1124,6 +1128,14 @@ make -f %{SOURCE20} VERSION=%{version} configs
   done
 %endif
 
+# Merge in any user-provided local config option changes
+for i in %{all_arch_configs}
+do
+  mv $i $i.tmp
+  ./merge.pl %{SOURCE1000} $i.tmp > $i
+  rm $i.tmp
+done
+
 ApplyOptionalPatch git-linus.diff
 
 ApplyPatch linux-2.6-makefile-after_link.patch
@@ -1950,8 +1962,10 @@ fi
 #             (__)\       )\/\
 #                 ||----w |
 #                 ||     ||
-
 %changelog
+* Mon Jan 10 2011 Jarod Wilson <jarod@redhat.com>
+- Add support for local rebuild config option overrides
+
 * Mon Jan 10 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git4.2
 - Disable DEBUG_SET_MODULE_RONX for now, it causes boot-up to fail since
   dynamic ftrace is trying to rewrite instructions on module load.