Author: maks
Date: Tue Jan 29 20:37:49 2008
New Revision: 10260
Log:
completly fix up scripts-kconfig-reportoldconfig.patch
was screwed due to new getopt() usage output..
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
Tue Jan 29 20:37:49 2008
@@ -1,8 +1,8 @@
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index e6499db..c16974c 100644
+index 32e8c5a..7e14c56 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -2,7 +2,7 @@ # ======================================
+@@ -2,7 +2,7 @@
# Kernel configuration targets
# These targets are used from top-level makefile
@@ -10,7 +10,7 @@
+PHONY += oldconfig xconfig gconfig menuconfig config reportoldconfig
silentoldconfig updateoldconfig update-po-config
Kconfig := arch/$(SRCARCH)/Kconfig
-
+
@@ -21,9 +21,15 @@ config: $(obj)/conf
oldconfig: $(obj)/conf
$< -o $(Kconfig)
@@ -28,7 +28,7 @@
# 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 4dcb886..b5e1b25 100644
+index fda6313..c9f3f3a 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -5,6 +5,7 @@
@@ -39,7 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-@@ -494,11 +495,100 @@ static void check_conf(struct menu *menu
+@@ -494,17 +495,106 @@ static void check_conf(struct menu *menu)
check_conf(child);
}
@@ -140,6 +140,13 @@
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
++ while ((opt = getopt(ac, av, "osdD:nmyrRUh")) != -1) {
+ switch (opt) {
+ case 'o':
+ input_mode = ask_new;
@@ -533,6 +623,14 @@ int main(int ac, char **av)
input_mode = set_random;
srand(time(NULL));
@@ -154,7 +161,7 @@
+ break;
case 'h':
printf(_("See README for usage info\n"));
- exit(0);
+ exit(0);
@@ -551,13 +649,17 @@ int main(int ac, char **av)
//zconfdump(stdout);
switch (input_mode) {
@@ -192,10 +199,10 @@
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
+index ee5fe94..3efce9f 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
-@@ -338,8 +338,6 @@ int conf_read(const char *name)
+@@ -366,8 +366,6 @@ int conf_read(const char *name)
* doesn't quite work if the Kconfig and the saved
* configuration disagree.
*/
@@ -205,10 +212,10 @@
case S_STRING:
case S_INT:
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
-index 6084525..9be2d56 100644
+index 9d4cba1..439608b 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
-@@ -101,6 +101,7 @@ #define SYMBOL_DEF_USER 0x10000
+@@ -100,6 +100,7 @@ struct symbol {
#define SYMBOL_DEF_AUTO 0x20000
#define SYMBOL_DEF3 0x40000
#define SYMBOL_DEF4 0x80000
@@ -217,10 +224,10 @@
#define SYMBOL_MAXLENGTH 256
#define SYMBOL_HASHSIZE 257
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
-index 2628023..c7ecae9 100644
+index 4bc68f2..4590130 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
-@@ -103,7 +103,7 @@ const char *str_get(struct gstr *gs);
+@@ -110,7 +110,7 @@ extern struct expr *sym_env_list;
void sym_init(void);
void sym_clear_all_valid(void);
void sym_set_all_changed(void);
@@ -230,7 +237,7 @@
struct property *prop_alloc(enum prop_type type, struct symbol *sym);
struct symbol *prop_get_symbol(struct property *prop);
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
-index ee225ce..f8a31ee 100644
+index 3929e5b..b035410 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -4,6 +4,7 @@
@@ -241,7 +248,7 @@
#include <stdlib.h>
#include <string.h>
#include <regex.h>
-@@ -201,7 +202,7 @@ static void sym_calc_visibility(struct s
+@@ -201,7 +202,7 @@ static void sym_calc_visibility(struct symbol *sym)
tri = yes;
if (sym->visible != tri) {
sym->visible = tri;
@@ -250,7 +257,7 @@
}
if (sym_is_choice_value(sym))
return;
-@@ -212,7 +213,7 @@ static void sym_calc_visibility(struct s
+@@ -212,7 +213,7 @@ static void sym_calc_visibility(struct symbol *sym)
tri = yes;
if (sym->rev_dep.tri != tri) {
sym->rev_dep.tri = tri;
@@ -277,7 +284,7 @@
}
}
}
-@@ -384,11 +385,13 @@ void sym_clear_all_valid(void)
+@@ -383,11 +384,13 @@ void sym_clear_all_valid(void)
sym_calc_value(modules_sym);
}
@@ -292,7 +299,7 @@
for (prop = sym->prop; prop; prop = prop->next) {
if (prop->menu)
prop->menu->flags |= MENU_CHANGED;
-@@ -401,7 +404,7 @@ void sym_set_all_changed(void)
+@@ -400,7 +403,7 @@ void sym_set_all_changed(void)
int i;
for_all_symbols(i, sym)
@@ -301,7 +308,7 @@
}
bool sym_tristate_within_range(struct symbol *sym, tristate val)
-@@ -432,7 +435,7 @@ bool sym_set_tristate_value(struct symbo
+@@ -431,7 +434,7 @@ bool sym_set_tristate_value(struct symbol *sym, tristate
val)
if (!(sym->flags & SYMBOL_DEF_USER)) {
sym->flags |= SYMBOL_DEF_USER;
@@ -310,7 +317,7 @@
}
/*
* setting a choice value also resets the new flag of the choice
-@@ -594,7 +597,7 @@ bool sym_set_string_value(struct symbol
+@@ -593,7 +596,7 @@ bool sym_set_string_value(struct symbol *sym, const char
*newval)
if (!(sym->flags & SYMBOL_DEF_USER)) {
sym->flags |= SYMBOL_DEF_USER;
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
