diff --git a/base/linux/12-conf-hacks.patch b/base/linux/12-conf-hacks.patch index f5d6e8489..302fd10a6 100644 --- a/base/linux/12-conf-hacks.patch +++ b/base/linux/12-conf-hacks.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../linux/12-conf-hacks.patch -# Copyright (C) 2008 - 2011 The OpenSDE Project +# Copyright (C) 2008 - 2012 The OpenSDE Project # Copyright (C) 2004 - 2008 The T2 SDE Project # Copyright (C) 1998 - 2003 ROCK Linux Project # @@ -19,28 +19,27 @@ Set all unset options to module. Needed by the OpenSDE Linux kernel auto configuration. -diff -up linux-2.6.36/scripts/kconfig/conf.c.conf_hack linux-2.6.36/scripts/kconfig/conf.c ---- linux-2.6.36/scripts/kconfig/conf.c.conf_hack 2010-12-10 11:05:25.584361328 +0100 -+++ linux-2.6.36/scripts/kconfig/conf.c 2010-12-10 11:23:04.154359980 +0100 -@@ -33,6 +33,7 @@ enum input_mode { +--- linux-3.7.1/scripts/kconfig/conf.c.orig 2012-12-11 04:30:57.000000000 +0100 ++++ linux-3.7.1/scripts/kconfig/conf.c 2012-12-19 02:37:02.241685899 +0100 +@@ -33,6 +33,7 @@ savedefconfig, listnewconfig, - oldnoconfig, + olddefconfig, + no2modconfig, } input_mode = oldaskconfig; - char *defconfig_file; -@@ -453,6 +454,7 @@ static struct option long_opts[] = { - {"randconfig", no_argument, NULL, randconfig}, - {"listnewconfig", no_argument, NULL, listnewconfig}, - {"oldnoconfig", no_argument, NULL, oldnoconfig}, + static int indent = 1; +@@ -461,6 +462,7 @@ + * value but not 'n') with the counter-intuitive name. + */ + {"oldnoconfig", no_argument, NULL, olddefconfig}, + {"no2modconfig", no_argument, NULL, no2modconfig}, {NULL, 0, NULL, 0} }; -@@ -562,6 +564,9 @@ int main(int ac, char **av) - else if (!stat("all.config", &tmpstat)) - conf_read_simple("all.config", S_DEF_USER); +@@ -608,6 +610,9 @@ + exit(1); + } break; + case no2modconfig: + conf_read_simple(".config", S_DEF_USER); @@ -48,7 +47,7 @@ diff -up linux-2.6.36/scripts/kconfig/conf.c.conf_hack linux-2.6.36/scripts/kcon default: break; } -@@ -597,6 +602,9 @@ int main(int ac, char **av) +@@ -643,6 +648,9 @@ case defconfig: conf_set_all_new_symbols(def_default); break;