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

[Bastian Blank]

Author: waldi
Date: Tue Aug 29 14:04:27 2006
New Revision: 7270

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

Log:
debian/patches/scripts-kconfig-reportoldconfig.patch: Fix changes detection.


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:04:27 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..e1a9782 100644
+index 4dcb886..88c82cd 100644
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
 @@ -4,6 +4,7 @@
@@ -61,9 +61,9 @@
 +				goto next;
 +		} else if (!(sym->flags & SYMBOL_CHOICE)) {
 +			sym_calc_value(sym);
-+			if (!(sym->flags & (SYMBOL_WRITE | SYMBOL_CHANGED_REAL)))
++			if ((sym->flags & (SYMBOL_WRITE | SYMBOL_CHANGED_REAL | SYMBOL_DEF_USER)) !=
++			    (SYMBOL_WRITE | SYMBOL_CHANGED_REAL | SYMBOL_DEF_USER))
 +				goto next;
-+			sym->flags &= ~SYMBOL_WRITE;
 +			type = sym->type;
 +			if (type == S_TRISTATE) {
 +				sym_calc_value(modules_sym);
@@ -178,16 +178,17 @@
  		}
  		break;
  	case ask_silent:
-@@ -617,6 +717,9 @@ int main(int ac, char **av)
- 		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
- 		return 1;
- 	}
+@@ -613,6 +713,10 @@ int main(int ac, char **av)
+ 		conf_cnt = 0;
+ 		check_conf(&rootmenu);
+ 	} while (conf_cnt);
++
 +	if (report)
 +		report_changes();
 +
- skip_check:
- 	if (input_mode == ask_silent && conf_write_autoconf()) {
+ 	if (conf_write(NULL)) {
  		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
 diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
 index 6084525..9be2d56 100644