summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2010-07-31 23:35:27 +0200
committerMichal Marek <mmarek@suse.cz>2010-08-03 13:49:31 +0200
commitef61ca88c511154d6bead23c08f9a021cfdfeb01 (patch)
tree3fc66cf250df8eef33f015b040dc0f4d04844763 /scripts
parent4062f1a4c030157216dc8932e27131975cf7253c (diff)
kconfig: rename loose_nonint_oldconfig => oldnoconfig
Rename target to something that fall more in line with the other kconfig targets. oldnoconfig shall read as: - read the old configuration and set all new options to no Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Aristeu Rozanski <aris@redhat.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/Makefile7
-rw-r--r--scripts/kconfig/conf.c14
2 files changed, 10 insertions, 11 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 549e50e49cbf..2142afb0a13b 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -90,9 +90,9 @@ PHONY += allnoconfig allyesconfig allmodconfig randconfig
allnoconfig allyesconfig allmodconfig randconfig: $(obj)/conf
$< --$@ $(Kconfig)
-PHONY += nonint_oldconfig loose_nonint_oldconfig defconfig
+PHONY += nonint_oldconfig oldnoconfig defconfig
-nonint_oldconfig loose_nonint_oldconfig: $(obj)/conf
+nonint_oldconfig oldnoconfig: $(obj)/conf
$< --$@ $(Kconfig)
defconfig: $(obj)/conf
@@ -124,8 +124,7 @@ help:
@echo ' allnoconfig - New config where all options are answered with no'
@echo ' nonint_oldconfig - Checks the current configuration and fails if an option is '
@echo ' not set'
- @echo ' loose_nonint_oldconfig - Same as nonint_oldconfig, but updates the config file with '
- @echo ' missing config options as unset'
+ @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)'
# lxdialog stuff
check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 2dec584f1268..1f86fca6b07f 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -34,7 +34,7 @@ enum input_mode {
randconfig,
defconfig,
nonint_oldconfig,
- loose_nonint_oldconfig,
+ oldnoconfig,
} input_mode = oldaskconfig;
char *defconfig_file;
@@ -367,7 +367,7 @@ static void conf(struct menu *menu)
case P_MENU:
if ((input_mode == silentoldconfig ||
input_mode == nonint_oldconfig ||
- input_mode == loose_nonint_oldconfig) &&
+ input_mode == oldnoconfig) &&
rootEntry != menu) {
check_conf(menu);
return;
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu)
if (sym_is_changable(sym) ||
(sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
if (input_mode == nonint_oldconfig ||
- input_mode == loose_nonint_oldconfig) {
+ input_mode == oldnoconfig) {
if (input_mode == nonint_oldconfig &&
sym->name && !sym_is_choice_value(sym)) {
if (!unset_variables)
@@ -460,7 +460,7 @@ static struct option long_opts[] = {
{"allmodconfig", no_argument, NULL, allmodconfig},
{"randconfig", no_argument, NULL, randconfig},
{"nonint_oldconfig", no_argument, NULL, nonint_oldconfig},
- {"loose_nonint_oldconfig", no_argument, NULL, loose_nonint_oldconfig},
+ {"oldnoconfig", no_argument, NULL, oldnoconfig},
{NULL, 0, NULL, 0}
};
@@ -540,7 +540,7 @@ int main(int ac, char **av)
case oldaskconfig:
case oldconfig:
case nonint_oldconfig:
- case loose_nonint_oldconfig:
+ case oldnoconfig:
conf_read(NULL);
break;
case allnoconfig:
@@ -603,7 +603,7 @@ int main(int ac, char **av)
input_mode = silentoldconfig;
/* fall through */
case nonint_oldconfig:
- case loose_nonint_oldconfig:
+ case oldnoconfig:
case silentoldconfig:
/* Update until a loop caused no more changes */
do {
@@ -611,7 +611,7 @@ int main(int ac, char **av)
check_conf(&rootmenu);
} while (conf_cnt &&
(input_mode != nonint_oldconfig &&
- input_mode != loose_nonint_oldconfig));
+ input_mode != oldnoconfig));
break;
}