Commit 21f540be authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

kconfig: sync with linux-3.0 



And drop unused make-write-deps patch.

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

support/kconfig/Makefile

+29 −39
Original line number Diff line number Diff line
@@ -80,11 +80,12 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	$(Q)xgettext --default-domain=linux                         \

	    --add-comments --keyword=_ --keyword=N_                 \

	    --from-code=UTF-8                                       \

	    --files-from=scripts/kconfig/POTFILES.in     \

	    --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \

	    --directory=$(srctree) --directory=$(objtree)           \

	    --output $(obj)/config.pot

	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot

	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch

	$(Q)(for i in `ls arch/*/Kconfig`;               \

	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig

	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \

	    do                                           \

		echo "  GEN $$i";                        \

		$(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h 
	    done )

	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \

	    --output $(obj)/linux.pot

	$(Q)rm -f arch/um/Kconfig.arch

	$(Q)rm -f $(srctree)/arch/um/Kconfig

	$(Q)rm -f $(obj)/config.pot



PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -168,56 +169,44 @@ conf-objs := conf.o zconf.tab.o 
mconf-objs     := mconf.o zconf.tab.o $(lxdialog)

nconf-objs     := nconf.o zconf.tab.o nconf.gui.o

kxgettext-objs	:= kxgettext.o zconf.tab.o

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o



hostprogs-y := conf qconf gconf kxgettext

hostprogs-y := conf



ifeq ($(MAKECMDGOALS),nconfig)

	hostprogs-y += nconf

endif

ifeq ($(findstring nconf,$(MAKECMDGOALS)),nconf)

ifeq ($(MAKECMDGOALS),nconf)

	hostprogs-y += nconf

endif



ifeq ($(MAKECMDGOALS),menuconfig)

	hostprogs-y += mconf

endif

ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)

ifeq ($(MAKECMDGOALS),mconf)

	hostprogs-y += mconf

endif



ifeq ($(MAKECMDGOALS),xconfig)

	qconf-target := 1

endif

ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)

	qconf-target := 1

ifeq ($(MAKECMDGOALS),update-po-config)

	hostprogs-y += kxgettext

endif



ifeq ($(MAKECMDGOALS),gconfig)

	gconf-target := 1

ifeq ($(MAKECMDGOALS),qconf)

	qconf-target := 1

endif

ifeq ($(findstring gconf,$(MAKECMDGOALS)),gconf)

ifeq ($(MAKECMDGOALS),gconf)

	gconf-target := 1

endif





ifeq ($(qconf-target),1)

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

	hostprogs-y += qconf

endif



ifeq ($(gconf-target),1)

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o

	hostprogs-y += gconf

endif



clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \

               .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h

clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck

clean-files	+= zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h

clean-files     += mconf qconf gconf nconf

clean-files     += config.pot linux.pot

clean-files += conf $(conf-objs)

clean-files += mconf $(mconf-objs)

clean-files += nconf $(nconf-objs)

clean-files += qconf qconf.o

clean-files += gconf gconf.o

clean-files += kconfig_load.o zconf.tab.o

clean-files += $(kxgettext-objs)



# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)

PHONY += $(obj)/dochecklxdialog
@@ -339,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h 
	$(KC_QT_MOC) -i $< -o $@



$(obj)/lkc_defs.h: $(src)/lkc_proto.h

	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'

	$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'



# Extract gconf menu items for I18N support

$(obj)/gconf.glade.h: $(obj)/gconf.glade

	intltool-extract --type=gettext/glade $(obj)/gconf.glade

	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \

	$(obj)/gconf.glade



###

# The following requires flex/bison/gperf

support/kconfig/conf.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int conf_choice(struct menu *menu) 
		}

		if (!child)

			continue;

		if (line[strlen(line) - 1] == '?') {

		if (line[0] && line[strlen(line) - 1] == '?') {

			print_help(child);

			continue;

		}

support/kconfig/confdata.c

+3 −17
Original line number Diff line number Diff line
@@ -559,8 +559,6 @@ int conf_write(const char *name) 
	const char *basename;

	const char *str;

	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];

	time_t now;

	int use_timestamp = 1;

	char *env;



	if (!name)
@@ -600,19 +598,11 @@ int conf_write(const char *name) 
	if (!out)

		return 1;



	time(&now);

	env = getenv("KCONFIG_NOTIMESTAMP");

	if (env && *env)

		use_timestamp = 0;



	fprintf(out, _("#\n"

		       "# Automatically generated make config: don't edit\n"

		       "# %s\n"

		       "%s%s"

		       "#\n"),

		     rootmenu.prompt->text,

		     use_timestamp ? "# " : "",

		     use_timestamp ? ctime(&now) : "");

		     rootmenu.prompt->text);



	if (!conf_get_changed())

		sym_clear_all_valid();
@@ -801,7 +791,6 @@ int conf_write_autoconf(void) 
	const char *str;

	const char *name;

	FILE *out, *tristate, *out_h;

	time_t now;

	int i;

	char dir[PATH_MAX+1], buf[PATH_MAX+1];

	char *s;
@@ -841,22 +830,19 @@ int conf_write_autoconf(void) 
		return 1;

	}



	time(&now);

	fprintf(out, "#\n"

		     "# Automatically generated make config: don't edit\n"

		     "# %s\n"

		     "# %s"

		     "#\n",

		     rootmenu.prompt->text, ctime(&now));

		     rootmenu.prompt->text);

	fprintf(tristate, "#\n"

			  "# Automatically generated - do not edit\n"

			  "\n");

	fprintf(out_h, "/*\n"

		       " * Automatically generated C config: don't edit\n"

		       " * %s\n"

		       " * %s"

		       " */\n",

		       rootmenu.prompt->text, ctime(&now));

		       rootmenu.prompt->text);



	for_all_symbols(i, sym) {

		sym_calc_value(sym);

support/kconfig/expr.h

+0 −4
Original line number Diff line number Diff line
@@ -20,12 +20,8 @@ struct file { 
	struct file *parent;

	const char *name;

	int lineno;

	int flags;

};



#define FILE_BUSY		0x0001

#define FILE_SCANNED		0x0002



typedef enum tristate {

	no, mod, yes

} tristate;

support/kconfig/gconf.c

+8 −4
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void init_left_tree(void) 


	gtk_tree_view_set_model(view, model1);

	gtk_tree_view_set_headers_visible(view, TRUE);

	gtk_tree_view_set_rules_hint(view, FALSE);

	gtk_tree_view_set_rules_hint(view, TRUE);



	column = gtk_tree_view_column_new();

	gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void) 


	gtk_tree_view_set_model(view, model2);

	gtk_tree_view_set_headers_visible(view, TRUE);

	gtk_tree_view_set_rules_hint(view, FALSE);

	gtk_tree_view_set_rules_hint(view, TRUE);



	column = gtk_tree_view_column_new();

	gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data) 
void on_single_clicked(GtkButton * button, gpointer user_data)

{

	view_mode = SINGLE_VIEW;

	gtk_paned_set_position(GTK_PANED(hpaned), 0);

	gtk_widget_hide(tree1_w);

	current = &rootmenu;

	display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data) 
void on_full_clicked(GtkButton * button, gpointer user_data)

{

	view_mode = FULL_VIEW;

	gtk_paned_set_position(GTK_PANED(hpaned), 0);

	gtk_widget_hide(tree1_w);

	if (tree2)

		gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu) 
                if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))

		    || (view_mode == FULL_VIEW)

		    || (view_mode == SPLIT_VIEW))*/



		/* Change paned position if the view is not in 'split mode' */

		if (view_mode == SINGLE_VIEW || view_mode == FULL_VIEW) {

			gtk_paned_set_position(GTK_PANED(hpaned), 0);

		}



		if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))

		    || (view_mode == FULL_VIEW)

		    || (view_mode == SPLIT_VIEW)) {