[kernel] r7271 - dists/trunk/linux-2.6/debian/patches

[Bastian Blank]

Author: waldi
Date: Tue Aug 29 14:19:52 2006
New Revision: 7271

Modified:
   dists/trunk/linux-2.6/debian/patches/scripts-kconfig-reportoldconfig.patch

Log:
debian/patches/scripts-kconfig-reportoldconfig.patch: Update.


Modified: dists/trunk/linux-2.6/debian/patches/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/scripts-kconfig-reportoldconfig.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/scripts-kconfig-reportoldconfig.patch	Tue Aug 29 14:19:52 2006
@@ -28,7 +28,7 @@
  	xgettext --default-domain=linux \
            --add-comments --keyword=_ --keyword=N_ \
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 4dcb886..88c82cd 100644
+index 4dcb886..b5e1b25 100644
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
 @@ -4,6 +4,7 @@
@@ -39,7 +39,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
-@@ -490,11 +491,98 @@ static void check_conf(struct menu *menu
+@@ -490,11 +491,100 @@ static void check_conf(struct menu *menu
  		check_conf(child);
  }
  
@@ -64,6 +64,8 @@
 +			if ((sym->flags & (SYMBOL_WRITE | SYMBOL_CHANGED_REAL | SYMBOL_DEF_USER)) !=
 +			    (SYMBOL_WRITE | SYMBOL_CHANGED_REAL | SYMBOL_DEF_USER))
 +				goto next;
++                        if (sym->visible == no)
++                                goto next;
 +			type = sym->type;
 +			if (type == S_TRISTATE) {
 +				sym_calc_value(modules_sym);
@@ -138,7 +140,7 @@
  
  	if (ac > i && av[i][0] == '-') {
  		switch (av[i++][1]) {
-@@ -530,6 +618,14 @@ int main(int ac, char **av)
+@@ -530,6 +620,14 @@ int main(int ac, char **av)
  			input_mode = set_random;
  			srandom(time(NULL));
  			break;
@@ -153,7 +155,7 @@
  		case 'h':
  		case '?':
  			fprintf(stderr, "See README for usage info\n");
-@@ -545,13 +641,17 @@ int main(int ac, char **av)
+@@ -545,13 +643,17 @@ int main(int ac, char **av)
  	//zconfdump(stdout);
  	switch (input_mode) {
  	case set_default:
@@ -178,7 +180,7 @@
  		}
  		break;
  	case ask_silent:
-@@ -613,6 +713,10 @@ int main(int ac, char **av)
+@@ -613,6 +715,10 @@ int main(int ac, char **av)
  		conf_cnt = 0;
  		check_conf(&rootmenu);
  	} while (conf_cnt);
@@ -190,6 +192,18 @@
  		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
  		return 1;
 diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
+index a69d8ac..0acd498 100644
+--- a/scripts/kconfig/confdata.c
++++ b/scripts/kconfig/confdata.c
+@@ -338,8 +338,6 @@ int conf_read(const char *name)
+ 		/* maybe print value in verbose mode... */
+ 	sym_ok:
+ 		if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
+-			if (sym->visible == no)
+-				sym->flags &= ~SYMBOL_DEF_USER;
+ 			switch (sym->type) {
+ 			case S_STRING:
+ 			case S_INT:
 diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
 index 6084525..9be2d56 100644
 --- a/scripts/kconfig/expr.h