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

[Maximilian Attems]

Author: maks
Date: Wed Jul 30 17:13:05 2008
New Revision: 11933

Log:
fix scripts-kconfig-reportoldconfig.patch to apply

otherwise no build.
argh this biest needs to be submitted properly upstream

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

Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	Wed Jul 30 17:13:05 2008
@@ -39,8 +39,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -494,17 +495,106 @@ static void check_conf(struct menu *menu)
- 		check_conf(child);
+@@ -464,17 +465,106 @@ static void check_conf(struct menu *menu)
+ 	return 0;
  }
  
 +void report_changes(void)
@@ -187,17 +187,17 @@
  		}
  		break;
  	case ask_silent:
-@@ -620,6 +722,10 @@ int main(int ac, char **av)
- 		conf_cnt = 0;
- 		check_conf(&rootmenu);
- 	} while (conf_cnt);
+@@ -596,6 +698,10 @@ int main(int ac, char **av)
+ 		break;
+ 	}
+ 
 +
 +	if (report)
 +		report_changes();
 +
- 	if (conf_write(NULL)) {
+ 	if (conf_get_changed() && conf_write(NULL)) {
  		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
- 		return 1;
+ 		exit(1);
 diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
 index ee5fe94..3efce9f 100644
 --- a/scripts/kconfig/confdata.c
@@ -283,7 +283,7 @@
 +				sym_set_changed(choice_sym, false);
  		}
  	}
- }
+ 
 @@ -383,11 +384,13 @@ void sym_clear_all_valid(void)
  		sym_calc_value(modules_sym);
  }