Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51f31afd authored by Michal Marek's avatar Michal Marek
Browse files

Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig

parents de125187 bdebd489

Documentation/kbuild/kconfig.txt

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG 
If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not

break symlinks when .config is a symlink to somewhere else.



KCONFIG_NOTIMESTAMP

--------------------------------------------------

If this environment variable exists and is non-null, the timestamp line

in generated .config files is omitted.



______________________________________________________________________

Environment variables for '{allyes/allmod/allno/rand}config'

scripts/kconfig/confdata.c

+1 −11
Original line number Diff line number Diff line
@@ -560,8 +560,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;



	dirname[0] = 0;
@@ -598,19 +596,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();

scripts/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)) {