rpms/kernel/devel config-generic, 1.145, 1.146 kernel.spec, 1.811, 1.812 linux-2.6-build-nonintconfig.patch, 1.13, 1.14

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18013

Modified Files:
	config-generic kernel.spec linux-2.6-build-nonintconfig.patch 
Log Message:
* Sun Jul 27 2008 Roland McGrath <roland at redhat.com>
- 2.6.26-git16
- Fix up linux-2.6-build-nonintconfig.patch after kconfig changes.
- Reenable sfc module.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- config-generic	27 Jul 2008 07:22:15 -0000	1.145
+++ config-generic	28 Jul 2008 02:08:36 -0000	1.146
@@ -438,6 +438,7 @@
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -1225,7 +1226,7 @@
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-CONFIG_SFC=n
+CONFIG_SFC=m
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1537,8 +1538,16 @@
 #
 # ISDN subsystem
 #
+CONFIG_ISDN=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
 
-CONFIG_ISDN=m
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_DRV_AVMB1_B1PCI=m
 CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- kernel.spec	27 Jul 2008 20:15:18 -0000	1.811
+++ kernel.spec	28 Jul 2008 02:08:36 -0000	1.812
@@ -1694,6 +1694,8 @@
 %changelog
 * Sun Jul 27 2008 Roland McGrath <roland at redhat.com>
 - 2.6.26-git16
+- Fix up linux-2.6-build-nonintconfig.patch after kconfig changes.
+- Reenable sfc module.
 
 * Sun Jul 27 2008 Roland McGrath <roland at redhat.com>
 - 2.6.26-git15

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-build-nonintconfig.patch	12 Feb 2008 06:18:04 -0000	1.13
+++ linux-2.6-build-nonintconfig.patch	28 Jul 2008 02:08:36 -0000	1.14
@@ -36,47 +36,51 @@
  static const char *get_help(struct menu *menu)
  {
  	if (menu_has_help(menu))
-@@ -112,6 +116,16 @@ static int conf_askvalue(struct symbol *sym, const char *def)
- 		fflush(stdout);
- 		fgets(line, 128, stdin);
- 		return 1;
-+	case dont_ask:
-+		if (!sym_has_value(sym)) {
-+			fprintf(stderr,"CONFIG_%s\n",sym->name);
-+			return_value++;
-+		}
-+		/*FALLTHROUGH*/
-+	case dont_ask_dont_tell:
-+		if (sym_has_value(sym))
-+			return 0;
-+		return 1;
- 	case set_default:
- 		printf("%s\n", def);
- 		return 1;
-@@ -351,6 +365,11 @@ static int conf_choice(struct menu *menu)
- 			printf("?");
- 		printf("]: ");
- 		switch (input_mode) {
-+		case dont_ask:
-+		case dont_ask_dont_tell:
-+			cnt = def;
-+			printf("%d\n", cnt);
-+			break;
- 		case ask_new:
- 		case ask_silent:
- 			if (!is_new) {
-@@ -486,6 +505,10 @@ static void check_conf(struct menu *menu)
+@@ -358,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;
+ 			}
+@@ -416,12 +423,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);
-+			if (input_mode == dont_ask
-+			    || input_mode == dont_ask_dont_tell)
-+				fprintf(stderr,"CONFIG_%s\n",sym->name);
-+			else
  			conf(rootEntry);
  		}
  	}
-@@ -504,11 +527,17 @@ int main(int ac, char **av)
++	}
+ 
+ 	for (child = menu->list; child; child = child->next)
+ 		check_conf(child);
+@@ -433,7 +449,8 @@ static void conf_do_update(void)
+ 	do {
+ 		conf_cnt = 0;
+ 		check_conf(&rootmenu);
+-	} while (conf_cnt);
++	} while (conf_cnt &&
++		 (input_mode != dont_ask && input_mode != dont_ask_dont_tell));
+ }
+ 
+ static int conf_silent_update(void)
+@@ -474,11 +491,17 @@ int main(int ac, char **av)
  	bindtextdomain(PACKAGE, LOCALEDIR);
  	textdomain(PACKAGE);
  
@@ -95,7 +99,7 @@
  		case 's':
  			input_mode = ask_silent;
  			valid_stdin = isatty(0) && isatty(1) && isatty(2);
-@@ -573,6 +602,8 @@ int main(int ac, char **av)
+@@ -543,6 +566,8 @@ int main(int ac, char **av)
  		}
  	case ask_all:
  	case ask_new:
@@ -104,20 +108,19 @@
  		conf_read(NULL);
  		break;
  	case set_no:
-@@ -619,7 +650,8 @@ int main(int ac, char **av)
- 	do {
- 		conf_cnt = 0;
- 		check_conf(&rootmenu);
--	} while (conf_cnt);
-+ 	} while (conf_cnt && (input_mode != dont_ask
-+			      && input_mode != dont_ask_dont_tell));
- 	if (conf_write(NULL)) {
+@@ -585,6 +610,8 @@ int main(int ac, char **av)
+ 	case set_default:
+ 		conf_set_all_new_symbols(def_default);
+ 		break;
++	case dont_ask:
++	case dont_ask_dont_tell:
+ 	case ask_silent:
+ 	case ask_new:
+ 		if (conf_silent_update())
+@@ -607,5 +634,5 @@ int main(int ac, char **av)
  		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
  		return 1;
-@@ -630,5 +662,5 @@ skip_check:
- 		return 1;
  	}
- 
 -	return 0;
 +	return return_value;
  }