devel/kernel/linux-2.6-build-nonintconfig.patch

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 6d69c7c..ff84d12 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -58,6 +58,11 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 	fi
 	$(Q)rm -f .tmp.config
 
+nonint_oldconfig: $(obj)/conf
+	$< -b $(Kconfig)
+loose_nonint_oldconfig: $(obj)/conf
+	$< -B $(Kconfig)
+
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 9960d1c..ac8d455 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -23,6 +23,8 @@ enum {
 	ask_all,
 	ask_new,
 	ask_silent,
+	dont_ask,
+	dont_ask_dont_tell,
 	set_default,
 	set_yes,
 	set_mod,
@@ -360,7 +362,10 @@ static void conf(struct menu *menu)
 
 		switch (prop->type) {
 		case P_MENU:
-			if (input_mode == ask_silent && rootEntry != menu) {
+			if ((input_mode == ask_silent ||
+			     input_mode == dont_ask ||
+			     input_mode == dont_ask_dont_tell) &&
+			    rootEntry != menu) {
 				check_conf(menu);
 				return;
 			}
@@ -406,6 +411,8 @@ conf_childs:
 		indent -= 2;
 }
 
+static int return_value;
+
 static void check_conf(struct menu *menu)
 {
 	struct symbol *sym;
@@ -418,12 +425,21 @@ 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 == dont_ask ||
+			    input_mode == dont_ask_dont_tell) {
+				if (input_mode == dont_ask &&
+				    sym->name && !sym_is_choice_value(sym)) {
+					fprintf(stderr,"CONFIG_%s\n",sym->name);
+					++return_value;
+				}
+			} else {
 			if (!conf_cnt++)
 				printf(_("*\n* Restart config...\n*\n"));
 			rootEntry = menu_get_parent_menu(menu);
 			conf(rootEntry);
 		}
 	}
+	}
 
 	for (child = menu->list; child; child = child->next)
 		check_conf(child);
@@ -439,7 +455,7 @@ int main(int ac, char **av)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
+ 	while ((opt = getopt(ac, av, "osbBdD:nmyrh")) != -1) {
 		switch (opt) {
 		case 'o':
 			input_mode = ask_silent;
@@ -448,6 +464,12 @@ int main(int ac, char **av)
 			input_mode = ask_silent;
 			sync_kconfig = 1;
 			break;
+		case 'b':
+			input_mode = dont_ask;
+			break;
+		case 'B':
+			input_mode = dont_ask_dont_tell;
+			break;
 		case 'd':
 			input_mode = set_default;
 			break;
@@ -525,6 +547,8 @@ int main(int ac, char **av)
 	case ask_silent:
 	case ask_all:
 	case ask_new:
+	case dont_ask:
+	case dont_ask_dont_tell:
 		conf_read(NULL);
 		break;
 	case set_no:
@@ -586,12 +610,16 @@ int main(int ac, char **av)
 		conf(&rootmenu);
 		input_mode = ask_silent;
 		/* fall through */
+	case dont_ask:
+	case dont_ask_dont_tell:
 	case ask_silent:
 		/* Update until a loop caused no more changes */
 		do {
 			conf_cnt = 0;
 			check_conf(&rootmenu);
-		} while (conf_cnt);
+		} while (conf_cnt &&
+			 (input_mode != dont_ask &&
+			  input_mode != dont_ask_dont_tell));
 		break;
 	}
 
@@ -613,5 +641,5 @@ int main(int ac, char **av)
 			exit(1);
 		}
 	}
-	return 0;
+	return return_value;
 }
1	diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
2	index 6d69c7c..ff84d12 100644
3	--- a/scripts/kconfig/Makefile
4	+++ b/scripts/kconfig/Makefile
5	@@ -58,6 +58,11 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
6	fi
7	$(Q)rm -f .tmp.config
8
9	+nonint_oldconfig: $(obj)/conf
10	+ $< -b $(Kconfig)
11	+loose_nonint_oldconfig: $(obj)/conf
12	+ $< -B $(Kconfig)
13	+
14	# Create new linux.pot file
15	# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
16	# The symlink is used to repair a deficiency in arch/um
17	diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
18	index 9960d1c..ac8d455 100644
19	--- a/scripts/kconfig/conf.c
20	+++ b/scripts/kconfig/conf.c
21	@@ -23,6 +23,8 @@ enum {
22	ask_all,
23	ask_new,
24	ask_silent,
25	+ dont_ask,
26	+ dont_ask_dont_tell,
27	set_default,
28	set_yes,
29	set_mod,
30	@@ -360,7 +362,10 @@ static void conf(struct menu *menu)
31
32	switch (prop->type) {
33	case P_MENU:
34	- if (input_mode == ask_silent && rootEntry != menu) {
35	+ if ((input_mode == ask_silent \|\|
36	+ input_mode == dont_ask \|\|
37	+ input_mode == dont_ask_dont_tell) &&
38	+ rootEntry != menu) {
39	check_conf(menu);
40	return;
41	}
42	@@ -406,6 +411,8 @@ conf_childs:
43	indent -= 2;
44	}
45
46	+static int return_value;
47	+
48	static void check_conf(struct menu *menu)
49	{
50	struct symbol *sym;
51	@@ -418,12 +425,21 @@ static void check_conf(struct menu *menu)
52	if (sym && !sym_has_value(sym)) {
53	if (sym_is_changable(sym) \|\|
54	(sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
55	+ if (input_mode == dont_ask \|\|
56	+ input_mode == dont_ask_dont_tell) {
57	+ if (input_mode == dont_ask &&
58	+ sym->name && !sym_is_choice_value(sym)) {
59	+ fprintf(stderr,"CONFIG_%s\n",sym->name);
60	+ ++return_value;
61	+ }
62	+ } else {
63	if (!conf_cnt++)
64	printf(_("\n Restart config...\n*\n"));
65	rootEntry = menu_get_parent_menu(menu);
66	conf(rootEntry);
67	}
68	}
69	+ }
70
71	for (child = menu->list; child; child = child->next)
72	check_conf(child);
73	@@ -439,7 +455,7 @@ int main(int ac, char **av)
74	bindtextdomain(PACKAGE, LOCALEDIR);
75	textdomain(PACKAGE);
76
77	- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
78	+ while ((opt = getopt(ac, av, "osbBdD:nmyrh")) != -1) {
79	switch (opt) {
80	case 'o':
81	input_mode = ask_silent;
82	@@ -448,6 +464,12 @@ int main(int ac, char **av)
83	input_mode = ask_silent;
84	sync_kconfig = 1;
85	break;
86	+ case 'b':
87	+ input_mode = dont_ask;
88	+ break;
89	+ case 'B':
90	+ input_mode = dont_ask_dont_tell;
91	+ break;
92	case 'd':
93	input_mode = set_default;
94	break;
95	@@ -525,6 +547,8 @@ int main(int ac, char **av)
96	case ask_silent:
97	case ask_all:
98	case ask_new:
99	+ case dont_ask:
100	+ case dont_ask_dont_tell:
101	conf_read(NULL);
102	break;
103	case set_no:
104	@@ -586,12 +610,16 @@ int main(int ac, char **av)
105	conf(&rootmenu);
106	input_mode = ask_silent;
107	/* fall through */
108	+ case dont_ask:
109	+ case dont_ask_dont_tell:
110	case ask_silent:
111	/* Update until a loop caused no more changes */
112	do {
113	conf_cnt = 0;
114	check_conf(&rootmenu);
115	- } while (conf_cnt);
116	+ } while (conf_cnt &&
117	+ (input_mode != dont_ask &&
118	+ input_mode != dont_ask_dont_tell));
119	break;
120	}
121
122	@@ -613,5 +641,5 @@ int main(int ac, char **av)
123	exit(1);
124	}
125	}
126	- return 0;
127	+ return return_value;
128	}
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2