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

Commit c955ccaf authored by Roman Zippel's avatar Roman Zippel Committed by Sam Ravnborg
Browse files

kconfig: fix .config dependencies 



This fixes one of the worst kbuild warts left - the broken dependencies used
to check and regenerate the .config file.  This was done via an indirect
dependency and the .config itself had an empty command, which can cause make
not to reread the changed .config file.

Instead of this we generate now a new file include/config/auto.conf from
.config, which is used for kbuild and has the proper dependencies.  It's also
the main make target now for all files generated during this step (and thus
replaces include/linux/autoconf.h).

This also means we can now relax the syntax requirements for the .config file
and we don't have to rewrite it all the time, i.e.  silentoldconfig only
writes .config now when it's necessary to keep it in sync with the Kconfig
files and even this can be suppressed by setting the environment variable
KCONFIG_NOSILENTUPDATE, so the update can (and must) be done manually.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent ddc97cac

Makefile

+11 −16
Original line number Original line Diff line number Diff line
@@ -404,7 +404,7 @@ include $(srctree)/arch/$(ARCH)/Makefile 
export KBUILD_DEFCONFIG

export KBUILD_DEFCONFIG





config %config: scripts_basic outputmakefile FORCE

config %config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux

	$(Q)mkdir -p include/linux include/config

	$(Q)$(MAKE) $(build)=scripts/kconfig $@

	$(Q)$(MAKE) $(build)=scripts/kconfig $@

	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease

	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@ -421,8 +421,6 @@ PHONY += scripts 
scripts: scripts_basic include/config/MARKER

scripts: scripts_basic include/config/MARKER

	$(Q)$(MAKE) $(build)=$(@)

	$(Q)$(MAKE) $(build)=$(@)





scripts_basic: include/linux/autoconf.h



# Objects we will link into vmlinux / subdirs we need to visit

# Objects we will link into vmlinux / subdirs we need to visit

init-y		:= init/

init-y		:= init/

drivers-y	:= drivers/ sound/

drivers-y	:= drivers/ sound/
@@ -436,25 +434,22 @@ ifeq ($(dot-config),1) 




# Read in dependencies to all Kconfig* files, make sure to run

# Read in dependencies to all Kconfig* files, make sure to run

# oldconfig if changes are detected.

# oldconfig if changes are detected.

-include .kconfig.d

-include include/config/auto.conf.cmd



-include include/config/auto.conf

include .config





# If .config needs to be updated, it will be done via the dependency

# that autoconf has on .config.

# To avoid any implicit rule to kick in, define an empty command

# To avoid any implicit rule to kick in, define an empty command

.config .kconfig.d: ;

.config include/config/auto.conf.cmd: ;





# If .config is newer than include/linux/autoconf.h, someone tinkered

# If .config is newer than include/config/auto.conf, someone tinkered

# with it and forgot to run make oldconfig.

# with it and forgot to run make oldconfig.

# If kconfig.d is missing then we are probarly in a cleaned tree so

# if auto.conf.cmd is missing then we are probarly in a cleaned tree so

# we execute the config step to be sure to catch updated Kconfig files

# we execute the config step to be sure to catch updated Kconfig files

include/linux/autoconf.h: .kconfig.d .config

include/config/auto.conf: .config include/config/auto.conf.cmd

	$(Q)mkdir -p include/linux

	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig

	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig



else

else

# Dummy target needed, because used as prerequisite

# Dummy target needed, because used as prerequisite

include/linux/autoconf.h: ;

include/config/auto.conf: ;

endif

endif





# The all: target is the default when no target is given on the

# The all: target is the default when no target is given on the
@@ -779,7 +774,7 @@ PHONY += prepare-all 
prepare3: .kernelrelease

prepare3: .kernelrelease

ifneq ($(KBUILD_SRC),)

ifneq ($(KBUILD_SRC),)

	@echo '  Using $(srctree) as source for kernel'

	@echo '  Using $(srctree) as source for kernel'

	$(Q)if [ -f $(srctree)/.config ]; then \

	$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \

		echo "  $(srctree) is not clean, please run 'make mrproper'";\

		echo "  $(srctree) is not clean, please run 'make mrproper'";\

		echo "  in the '$(srctree)' directory.";\

		echo "  in the '$(srctree)' directory.";\

		/bin/false; \

		/bin/false; \
@@ -822,7 +817,7 @@ include/asm: 




# 	Split autoconf.h into include/linux/config/*

# 	Split autoconf.h into include/linux/config/*





include/config/MARKER: scripts/basic/split-include include/linux/autoconf.h

include/config/MARKER: scripts/basic/split-include include/config/auto.conf

	@echo '  SPLIT   include/linux/autoconf.h -> include/config/*'

	@echo '  SPLIT   include/linux/autoconf.h -> include/config/*'

	@scripts/basic/split-include include/linux/autoconf.h include/config

	@scripts/basic/split-include include/linux/autoconf.h include/config

	@touch $@

	@touch $@

scripts/Makefile.build

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ PHONY := __build 
__build:

__build:





# Read .config if it exist, otherwise ignore

# Read .config if it exist, otherwise ignore

-include .config

-include include/config/auto.conf





include scripts/Kbuild.include

include scripts/Kbuild.include

scripts/Makefile.modpost

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
PHONY := _modpost

PHONY := _modpost

_modpost: __modpost

_modpost: __modpost





include .config

include include/config/auto.conf

include scripts/Kbuild.include

include scripts/Kbuild.include

include scripts/Makefile.lib

include scripts/Makefile.lib

scripts/kconfig/conf.c

+15 −1
Original line number Original line Diff line number Diff line
@@ -599,7 +599,15 @@ int main(int ac, char **av) 
			input_mode = ask_silent;

			input_mode = ask_silent;

			valid_stdin = 1;

			valid_stdin = 1;

		}

		}

	} else if (sym_change_count) {

		name = getenv("KCONFIG_NOSILENTUPDATE");

		if (name && *name) {

			fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));

			return 1;

		}

		}

	} else

		goto skip_check;



	do {

	do {

		conf_cnt = 0;

		conf_cnt = 0;

		check_conf(&rootmenu);

		check_conf(&rootmenu);
@@ -608,5 +616,11 @@ int main(int ac, char **av) 
		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));

		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));

		return 1;

		return 1;

	}

	}

skip_check:

	if (input_mode == ask_silent && conf_write_autoconf()) {

		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));

		return 1;

	}



	return 0;

	return 0;

}
 
}

scripts/kconfig/confdata.c

+124 −53
Original line number Original line Diff line number Diff line
@@ -342,7 +342,7 @@ int conf_read(const char *name) 




int conf_write(const char *name)

int conf_write(const char *name)

{

{

	FILE *out, *out_h;

	FILE *out;

	struct symbol *sym;

	struct symbol *sym;

	struct menu *menu;

	struct menu *menu;

	const char *basename;

	const char *basename;
@@ -379,13 +379,6 @@ int conf_write(const char *name) 
	out = fopen(newname, "w");

	out = fopen(newname, "w");

	if (!out)

	if (!out)

		return 1;

		return 1;

	out_h = NULL;

	if (!name) {

		out_h = fopen(".tmpconfig.h", "w");

		if (!out_h)

			return 1;

		file_write_dep(NULL);

	}

	sym = sym_lookup("KERNELVERSION", 0);

	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	sym_calc_value(sym);

	time(&now);

	time(&now);
@@ -401,16 +394,6 @@ int conf_write(const char *name) 
		     sym_get_string_value(sym),

		     sym_get_string_value(sym),

		     use_timestamp ? "# " : "",

		     use_timestamp ? "# " : "",

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

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

	if (out_h)

		fprintf(out_h, "/*\n"

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

			       " * Linux kernel version: %s\n"

			       "%s%s"

			       " */\n"

			       "#define AUTOCONF_INCLUDED\n",

			       sym_get_string_value(sym),

			       use_timestamp ? " * " : "",

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





	if (!sym_change_count)

	if (!sym_change_count)

		sym_clear_all_valid();

		sym_clear_all_valid();
@@ -426,11 +409,6 @@ int conf_write(const char *name) 
				     "#\n"

				     "#\n"

				     "# %s\n"

				     "# %s\n"

				     "#\n", str);

				     "#\n", str);

			if (out_h)

				fprintf(out_h, "\n"

					       "/*\n"

					       " * %s\n"

					       " */\n", str);

		} else if (!(sym->flags & SYMBOL_CHOICE)) {

		} else if (!(sym->flags & SYMBOL_CHOICE)) {

			sym_calc_value(sym);

			sym_calc_value(sym);

			if (!(sym->flags & SYMBOL_WRITE))

			if (!(sym->flags & SYMBOL_WRITE))
@@ -448,59 +426,39 @@ int conf_write(const char *name) 
				switch (sym_get_tristate_value(sym)) {

				switch (sym_get_tristate_value(sym)) {

				case no:

				case no:

					fprintf(out, "# CONFIG_%s is not set\n", sym->name);

					fprintf(out, "# CONFIG_%s is not set\n", sym->name);

					if (out_h)

						fprintf(out_h, "#undef CONFIG_%s\n", sym->name);

					break;

					break;

				case mod:

				case mod:

					fprintf(out, "CONFIG_%s=m\n", sym->name);

					fprintf(out, "CONFIG_%s=m\n", sym->name);

					if (out_h)

						fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);

					break;

					break;

				case yes:

				case yes:

					fprintf(out, "CONFIG_%s=y\n", sym->name);

					fprintf(out, "CONFIG_%s=y\n", sym->name);

					if (out_h)

						fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);

					break;

					break;

				}

				}

				break;

				break;

			case S_STRING:

			case S_STRING:

				// fix me

				str = sym_get_string_value(sym);

				str = sym_get_string_value(sym);

				fprintf(out, "CONFIG_%s=\"", sym->name);

				fprintf(out, "CONFIG_%s=\"", sym->name);

				if (out_h)

				while (1) {

					fprintf(out_h, "#define CONFIG_%s \"", sym->name);

				do {

					l = strcspn(str, "\"\\");

					l = strcspn(str, "\"\\");

					if (l) {

					if (l) {

						fwrite(str, l, 1, out);

						fwrite(str, l, 1, out);

						if (out_h)

							fwrite(str, l, 1, out_h);

					}

						str += l;

						str += l;

					while (*str == '\\' || *str == '"') {

						fprintf(out, "\\%c", *str);

						if (out_h)

							fprintf(out_h, "\\%c", *str);

						str++;

					}

					}

				} while (*str);

					if (!*str)

						break;

					fprintf(out, "\\%c", *str++);

				}

				fputs("\"\n", out);

				fputs("\"\n", out);

				if (out_h)

					fputs("\"\n", out_h);

				break;

				break;

			case S_HEX:

			case S_HEX:

				str = sym_get_string_value(sym);

				str = sym_get_string_value(sym);

				if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {

				if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {

					fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

					fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

					if (out_h)

						fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);

					break;

					break;

				}

				}

			case S_INT:

			case S_INT:

				str = sym_get_string_value(sym);

				str = sym_get_string_value(sym);

				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

				if (out_h)

					fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);

				break;

				break;

			}

			}

		}

		}
@@ -520,10 +478,6 @@ int conf_write(const char *name) 
		}

		}

	}

	}

	fclose(out);

	fclose(out);

	if (out_h) {

		fclose(out_h);

		rename(".tmpconfig.h", "include/linux/autoconf.h");

	}

	if (!name || basename != conf_def_filename) {

	if (!name || basename != conf_def_filename) {

		if (!name)

		if (!name)

			name = conf_def_filename;

			name = conf_def_filename;
@@ -542,3 +496,120 @@ int conf_write(const char *name) 




	return 0;

	return 0;

}

}



int conf_write_autoconf(void)

{

	struct symbol *sym;

	const char *str;

	char *name;

	FILE *out, *out_h;

	time_t now;

	int i, l;



	file_write_dep("include/config/auto.conf.cmd");



	out = fopen(".tmpconfig", "w");

	if (!out)

		return 1;



	out_h = fopen(".tmpconfig.h", "w");

	if (!out_h) {

		fclose(out);

		return 1;

	}



	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	time(&now);

	fprintf(out, "#\n"

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

		     "# Linux kernel version: %s\n"

		     "# %s"

		     "#\n",

		     sym_get_string_value(sym), ctime(&now));

	fprintf(out_h, "/*\n"

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

		       " * Linux kernel version: %s\n"

		       " * %s"

		       " */\n"

		       "#define AUTOCONF_INCLUDED\n",

		       sym_get_string_value(sym), ctime(&now));



	sym_clear_all_valid();



	for_all_symbols(i, sym) {

		sym_calc_value(sym);

		if (!(sym->flags & SYMBOL_WRITE) || !sym->name)

			continue;

		switch (sym->type) {

		case S_BOOLEAN:

		case S_TRISTATE:

			switch (sym_get_tristate_value(sym)) {

			case no:

				break;

			case mod:

				fprintf(out, "CONFIG_%s=m\n", sym->name);

				fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);

				break;

			case yes:

				fprintf(out, "CONFIG_%s=y\n", sym->name);

				fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);

				break;

			}

			break;

		case S_STRING:

			str = sym_get_string_value(sym);

			fprintf(out, "CONFIG_%s=\"", sym->name);

			fprintf(out_h, "#define CONFIG_%s \"", sym->name);

			while (1) {

				l = strcspn(str, "\"\\");

				if (l) {

					fwrite(str, l, 1, out);

					fwrite(str, l, 1, out_h);

					str += l;

				}

				if (!*str)

					break;

				fprintf(out, "\\%c", *str);

				fprintf(out_h, "\\%c", *str);

				str++;

			}

			fputs("\"\n", out);

			fputs("\"\n", out_h);

			break;

		case S_HEX:

			str = sym_get_string_value(sym);

			if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {

				fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

				fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);

				break;

			}

		case S_INT:

			str = sym_get_string_value(sym);

			fprintf(out, "CONFIG_%s=%s\n", sym->name, str);

			fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);

			break;

		default:

			break;

		}

	}

	fclose(out);

	fclose(out_h);



	name = getenv("KCONFIG_AUTOHEADER");

	if (!name)

		name = "include/linux/autoconf.h";

	if (rename(".tmpconfig.h", name))

		return 1;

	name = getenv("KCONFIG_AUTOCONFIG");

	if (!name)

		name = "include/config/auto.conf";

	/*

	 * This must be the last step, kbuild has a dependency on auto.conf

	 * and this marks the successful completion of the previous steps.

	 */

	if (rename(".tmpconfig", name))

		return 1;



	return 0;

}