Commit 359a9226 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package/config: Rebase against Linux 2.6.36 



No significant changes, but makes it easier to rebase against newer
versions.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a7306b8a

package/config/conf.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu) 
				if (sym->name && !sym_is_choice_value(sym)) {

					printf("CONFIG_%s\n", sym->name);

				}

			} else {

			} else if (input_mode != oldnoconfig) {

				if (!conf_cnt++)

					printf(_("*\n* Restart config...\n*\n"));

				rootEntry = menu_get_parent_menu(menu);

package/config/confdata.c

+4 −2
Original line number Diff line number Diff line
@@ -492,7 +492,9 @@ int conf_write_defconfig(const char *filename) 
			/*

			 * If symbol is a choice value and equals to the

			 * default for a choice - skip.

			 * But only if value is bool and equal to "y" .

			 * But only if value is bool and equal to "y" and

			 * choice is not "optional".

			 * (If choice is "optional" then all values can be "n")

			 */

			if (sym_is_choice_value(sym)) {

				struct symbol *cs;
@@ -500,7 +502,7 @@ int conf_write_defconfig(const char *filename) 


				cs = prop_get_symbol(sym_get_choice_prop(sym));

				ds = sym_choice_default(cs);

				if (sym == ds) {

				if (!sym_is_optional(cs) && sym == ds) {

					if ((sym->type == S_BOOLEAN) &&

					    sym_get_tristate_value(sym) == yes)

						goto next_menu;

package/config/expr.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct menu { 
	struct symbol *sym;

	struct property *prompt;

	struct expr *dep;

	struct expr *dir_dep;

	unsigned int flags;

	char *help;

	struct file *file;

package/config/menu.c

+3 −6
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static struct expr *menu_check_dep(struct expr *e) 
void menu_add_dep(struct expr *dep)

{

	current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));

	current_entry->dir_dep = current_entry->dep;

}



void menu_set_type(int type)
@@ -291,10 +290,6 @@ void menu_finalize(struct menu *parent) 
		for (menu = parent->list; menu; menu = menu->next)

			menu_finalize(menu);

	} else if (sym) {

		/* ignore inherited dependencies for dir_dep */

		sym->dir_dep.expr = expr_transform(expr_copy(parent->dir_dep));

		sym->dir_dep.expr = expr_eliminate_dups(sym->dir_dep.expr);



		basedep = parent->prompt ? parent->prompt->visible.expr : NULL;

		basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);

		basedep = expr_eliminate_dups(expr_transform(basedep));
@@ -325,6 +320,8 @@ void menu_finalize(struct menu *parent) 
			parent->next = last_menu->next;

			last_menu->next = NULL;

		}



		sym->dir_dep.expr = parent->dep;

	}

	for (menu = parent->list; menu; menu = menu->next) {

		if (sym && sym_is_choice(sym) &&
@@ -566,7 +563,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) 


	if (menu_has_help(menu)) {

		if (sym->name) {

			str_printf(help, "%s:\n\n", sym->name);

			str_printf(help, "CONFIG_%s:\n\n", sym->name);

			str_append(help, _(menu_get_help(menu)));

			str_append(help, "\n");

		}

package/config/patches/01-kconfig-kernel-to-buildroot.patch

+5 −5
Original line number Diff line number Diff line 
---

 conf.c              |   12 ++++++------

 confdata.c          |   12 ++++--------

 confdata.c          |   14 +++++++-------

 gconf.c             |    4 ++--

 gconf.glade         |    2 +-

 mconf.c             |   38 ++++++++++++++++++--------------------

 qconf.cc            |    4 ++--

 zconf.tab.c_shipped |    2 +-

 zconf.y             |    2 +-

 8 files changed, 35 insertions(+), 41 deletions(-)

 8 files changed, 38 insertions(+), 40 deletions(-)



Index: config/conf.c

===================================================================
@@ -60,7 +60,7 @@ Index: config/confdata.c 
===================================================================

--- config.orig/confdata.c

+++ config/confdata.c

@@ -579,7 +579,7 @@

@@ -581,7 +581,7 @@

 	if (!out)

 		return 1;
@@ -69,7 +69,7 @@ Index: config/confdata.c 
 	sym_calc_value(sym);

 	time(&now);

 	env = getenv("KCONFIG_NOTIMESTAMP");

@@ -588,7 +588,7 @@

@@ -590,7 +590,7 @@

 

 	fprintf(out, _("#\n"

 		       "# Automatically generated make config: don't edit\n"
@@ -78,7 +78,7 @@ Index: config/confdata.c 
 		       "%s%s"

 		       "#\n"),

 		     sym_get_string_value(sym),

@@ -802,25 +802,25 @@

@@ -804,25 +804,25 @@

 		return 1;

 	}