kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias (fb16d891) · Commits · e / devices / android_kernel_teracube_2e

scripts/kconfig/Makefile

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -76,11 +76,17 @@ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
	allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf		allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
	$< --$@ $(Kconfig)		$< --$@ $(Kconfig)

	PHONY += listnewconfig oldnoconfig savedefconfig defconfig		PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig

	listnewconfig oldnoconfig: $(obj)/conf		listnewconfig olddefconfig: $(obj)/conf
	$< --$@ $(Kconfig)		$< --$@ $(Kconfig)

			# oldnoconfig is an alias of olddefconfig, because people already are dependent
			# on its behavior(sets new symbols to their default value but not 'n') with the
			# counter-intuitive name.
			oldnoconfig: $(obj)/conf
			$< --olddefconfig $(Kconfig)

	savedefconfig: $(obj)/conf		savedefconfig: $(obj)/conf
	$< --$@=defconfig $(Kconfig)		$< --$@=defconfig $(Kconfig)

	@@ -114,7 +120,7 @@ help:
	@echo ' alldefconfig - New config with all symbols set to default'		@echo ' alldefconfig - New config with all symbols set to default'
	@echo ' randconfig - New config with random answer to all options'		@echo ' randconfig - New config with random answer to all options'
	@echo ' listnewconfig - List new options'		@echo ' listnewconfig - List new options'
	@echo ' oldnoconfig - Same as silentoldconfig but sets new symbols to their default value'		@echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their default value'

	# lxdialog stuff		# lxdialog stuff
	check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh		check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh

scripts/kconfig/conf.c

+16 −9

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ enum input_mode {
	defconfig,		defconfig,
	savedefconfig,		savedefconfig,
	listnewconfig,		listnewconfig,
	oldnoconfig,		olddefconfig,
	} input_mode = oldaskconfig;		} input_mode = oldaskconfig;

	static int indent = 1;		static int indent = 1;
	@@ -365,7 +365,7 @@ static void conf(struct menu *menu)
	case P_MENU:		case P_MENU:
	if ((input_mode == silentoldconfig \|\|		if ((input_mode == silentoldconfig \|\|
	input_mode == listnewconfig \|\|		input_mode == listnewconfig \|\|
	input_mode == oldnoconfig) &&		input_mode == olddefconfig) &&
	rootEntry != menu) {		rootEntry != menu) {
	check_conf(menu);		check_conf(menu);
	return;		return;
	@@ -429,7 +429,7 @@ static void check_conf(struct menu *menu)
	if (sym->name && !sym_is_choice_value(sym)) {		if (sym->name && !sym_is_choice_value(sym)) {
	printf("%s%s\n", CONFIG_, sym->name);		printf("%s%s\n", CONFIG_, sym->name);
	}		}
	} else if (input_mode != oldnoconfig) {		} else if (input_mode != olddefconfig) {
	if (!conf_cnt++)		if (!conf_cnt++)
	printf(_("\n Restart config...\n*\n"));		printf(_("\n Restart config...\n*\n"));
	rootEntry = menu_get_parent_menu(menu);		rootEntry = menu_get_parent_menu(menu);
	@@ -454,7 +454,13 @@ static struct option long_opts[] = {
	{"alldefconfig", no_argument, NULL, alldefconfig},		{"alldefconfig", no_argument, NULL, alldefconfig},
	{"randconfig", no_argument, NULL, randconfig},		{"randconfig", no_argument, NULL, randconfig},
	{"listnewconfig", no_argument, NULL, listnewconfig},		{"listnewconfig", no_argument, NULL, listnewconfig},
	{"oldnoconfig", no_argument, NULL, oldnoconfig},		{"olddefconfig", no_argument, NULL, olddefconfig},
			/*
			* oldnoconfig is an alias of olddefconfig, because people already
			* are dependent on its behavior(sets new symbols to their default
			* value but not 'n') with the counter-intuitive name.
			*/
			{"oldnoconfig", no_argument, NULL, olddefconfig},
	{NULL, 0, NULL, 0}		{NULL, 0, NULL, 0}
	};		};

	@@ -467,7 +473,8 @@ static void conf_usage(const char *progname)
	printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");		printf(" --oldaskconfig Start a new configuration using a line-oriented program\n");
	printf(" --oldconfig Update a configuration using a provided .config as base\n");		printf(" --oldconfig Update a configuration using a provided .config as base\n");
	printf(" --silentoldconfig Same as oldconfig, but quietly, additionally update deps\n");		printf(" --silentoldconfig Same as oldconfig, but quietly, additionally update deps\n");
	printf(" --oldnoconfig Same as silentoldconfig but sets new symbols to their default value\n");		printf(" --olddefconfig Same as silentoldconfig but sets new symbols to their default value\n");
			printf(" --oldnoconfig An alias of olddefconfig\n");
	printf(" --defconfig <file> New config with default defined in <file>\n");		printf(" --defconfig <file> New config with default defined in <file>\n");
	printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n");		printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n");
	printf(" --allnoconfig New config where all options are answered with no\n");		printf(" --allnoconfig New config where all options are answered with no\n");
	@@ -520,7 +527,7 @@ int main(int ac, char **av)
	case allmodconfig:		case allmodconfig:
	case alldefconfig:		case alldefconfig:
	case listnewconfig:		case listnewconfig:
	case oldnoconfig:		case olddefconfig:
	break;		break;
	case '?':		case '?':
	conf_usage(progname);		conf_usage(progname);
	@@ -565,7 +572,7 @@ int main(int ac, char **av)
	case oldaskconfig:		case oldaskconfig:
	case oldconfig:		case oldconfig:
	case listnewconfig:		case listnewconfig:
	case oldnoconfig:		case olddefconfig:
	conf_read(NULL);		conf_read(NULL);
	break;		break;
	case allnoconfig:		case allnoconfig:
	@@ -645,7 +652,7 @@ int main(int ac, char **av)
	/* fall through */		/* fall through */
	case oldconfig:		case oldconfig:
	case listnewconfig:		case listnewconfig:
	case oldnoconfig:		case olddefconfig:
	case silentoldconfig:		case silentoldconfig:
	/* Update until a loop caused no more changes */		/* Update until a loop caused no more changes */
	do {		do {
	@@ -653,7 +660,7 @@ int main(int ac, char **av)
	check_conf(&rootmenu);		check_conf(&rootmenu);
	} while (conf_cnt &&		} while (conf_cnt &&
	(input_mode != listnewconfig &&		(input_mode != listnewconfig &&
	input_mode != oldnoconfig));		input_mode != olddefconfig));
	break;		break;
	}		}

tools/testing/ktest/ktest.pl

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1871,10 +1871,10 @@ sub make_oldconfig {
	apply_min_config;		apply_min_config;
	}		}

	if (!run_command "$make oldnoconfig") {		if (!run_command "$make olddefconfig") {
	# Perhaps oldnoconfig doesn't exist in this version of the kernel		# Perhaps olddefconfig doesn't exist in this version of the kernel
	# try a yes '' \| oldconfig		# try a yes '' \| oldconfig
	doprint "oldnoconfig failed, trying yes '' \| make oldconfig\n";		doprint "olddefconfig failed, trying yes '' \| make oldconfig\n";
	run_command "yes '' \| $make oldconfig" or		run_command "yes '' \| $make oldconfig" or
	dodie "failed make config oldconfig";		dodie "failed make config oldconfig";
	}		}
	@@ -1927,7 +1927,7 @@ sub build {

	# old config can ask questions		# old config can ask questions
	if ($type eq "oldconfig") {		if ($type eq "oldconfig") {
	$type = "oldnoconfig";		$type = "olddefconfig";

	# allow for empty configs		# allow for empty configs
	run_command "touch $output_config";		run_command "touch $output_config";
	@@ -1957,7 +1957,7 @@ sub build {
	load_force_config($minconfig);		load_force_config($minconfig);
	}		}

	if ($type ne "oldnoconfig") {		if ($type ne "olddefconfig") {
	run_command "$make $type" or		run_command "$make $type" or
	dodie "failed make config";		dodie "failed make config";
	}		}
	@@ -2456,8 +2456,7 @@ my %config_set;

	# config_off holds the set of configs that the bad config had disabled.		# config_off holds the set of configs that the bad config had disabled.
	# We need to record them and set them in the .config when running		# We need to record them and set them in the .config when running
	# oldnoconfig, because oldnoconfig does not turn off new symbols, but		# olddefconfig, because olddefconfig keeps the defaults.
	# instead just keeps the defaults.
	my %config_off;		my %config_off;

	# config_off_tmp holds a set of configs to turn off for now		# config_off_tmp holds a set of configs to turn off for now
	@@ -3248,7 +3247,7 @@ sub test_this_config {
	}		}

	# Remove this config from the list of configs		# Remove this config from the list of configs
	# do a make oldnoconfig and then read the resulting		# do a make olddefconfig and then read the resulting
	# .config to make sure it is missing the config that		# .config to make sure it is missing the config that
	# we had before		# we had before
	my %configs = %min_configs;		my %configs = %min_configs;