From 201b16fb19290f162b82d31a41d32a70b012a429 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
Date: Tue, 17 Aug 2010 17:20:03 -0400
Subject: [PATCH] fix oldnoconfig

---
 fix-oldnoconfig-to-dtrt.patch | 29 +++++++++++++++++++++++++++++
 kernel.spec                   |  9 ++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 fix-oldnoconfig-to-dtrt.patch

diff --git a/fix-oldnoconfig-to-dtrt.patch b/fix-oldnoconfig-to-dtrt.patch
new file mode 100644
index 000000000..1c49bef6f
--- /dev/null
+++ b/fix-oldnoconfig-to-dtrt.patch
@@ -0,0 +1,29 @@
+From 726a550e84ab288ddc8f0be7645997326884206e Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
+Date: Tue, 17 Aug 2010 17:13:48 -0400
+Subject: fix oldnoconfig to do what i want
+
+---
+ scripts/kconfig/conf.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
+index 5b7c86e..dd09320 100644
+--- a/scripts/kconfig/conf.c
++++ b/scripts/kconfig/conf.c
+@@ -423,8 +423,10 @@ static void check_conf(struct menu *menu)
+ 	if (sym && !sym_has_value(sym)) {
+ 		if (sym_is_changable(sym) ||
+ 		    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
+-			if (input_mode == listnewconfig) {
+-				if (sym->name && !sym_is_choice_value(sym)) {
++			if (input_mode == listnewconfig ||
++			    input_mode == oldnoconfig) {
++				if (input_mode == listnewconfig &&
++				    sym->name && !sym_is_choice_value(sym)) {
+ 					printf("CONFIG_%s\n", sym->name);
+ 				}
+ 			} else {
+-- 
+1.7.2.1
+
diff --git a/kernel.spec b/kernel.spec
index f200ac8ea..71f974e8e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 0
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -584,8 +584,11 @@ Patch04: linux-2.6-compile-fixes.patch
 # build tweak for build ID magic, even for -vanilla
 Patch05: linux-2.6-makefile-after_link.patch
 
+Patch08: fix-oldnoconfig-to-dtrt.patch
+
 %if !%{nopatches}
 
+
 # revert upstream patches we get via other methods
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
@@ -1085,6 +1088,7 @@ make -f %{SOURCE20} VERSION=%{version} configs
 
 ApplyOptionalPatch git-linus.diff
 
+ApplyPatch fix-oldnoconfig-to-dtrt.patch
 ApplyPatch linux-2.6-makefile-after_link.patch
 
 #
@@ -1858,6 +1862,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Tue Aug 17 2010 Kyle McMartin <kyle@redhat.com> - 2.6.36-0.1.rc1.git0
+- Fix 'oldnoconfig' to do what nonint_loose_oldconfig did.
+
 * Tue Aug 17 2010 Kyle McMartin <kyle@redhat.com>
 - explicitly set KERNEL_GZIP