History

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

Sam Ravnborg committed 16 years ago

Commit ef61ca81 parent 4062f1a2 files · +10 −11Browse files

Showing the changes to scripts (2 of 2 files). Show all

Unified · Split

2 files
  1. scripts/kconfig/Makefile +3 −4
  2. scripts/kconfig/conf.c +7 −7
scripts/kconfig/Makefile+3−4
@@ -90,9 +90,9 @@ PHONY += allnoconfig allyesconfig allmodconfig randconfig · 89 unmodified lines
90allnoconfig allyesconfig allmodconfig randconfig: $(obj)/conf90allnoconfig allyesconfig allmodconfig randconfig: $(obj)/conf
91 $< --$@ $(Kconfig)91 $< --$@ $(Kconfig)
92 92
93PHONY += nonint_oldconfig loose_nonint_oldconfig defconfig93PHONY += nonint_oldconfig oldnoconfig defconfig
94 94
95nonint_oldconfig loose_nonint_oldconfig: $(obj)/conf95nonint_oldconfig oldnoconfig: $(obj)/conf
96 $< --$@ $(Kconfig)96 $< --$@ $(Kconfig)
97 97
98defconfig: $(obj)/conf98defconfig: $(obj)/conf
@@ -124,8 +124,7 @@ help: · 25 unmodified lines
124 @echo ' allnoconfig - New config where all options are answered with no'124 @echo ' allnoconfig - New config where all options are answered with no'
125 @echo ' nonint_oldconfig - Checks the current configuration and fails if an option is '125 @echo ' nonint_oldconfig - Checks the current configuration and fails if an option is '
126 @echo ' not set'126 @echo ' not set'
127 @echo ' loose_nonint_oldconfig - Same as nonint_oldconfig, but updates the config file with '127 @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)'
128 @echo ' missing config options as unset'
129 128
130# lxdialog stuff129# lxdialog stuff
131check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh130check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
scripts/kconfig/conf.c+7−7
@@ -34,7 +34,7 @@ enum input_mode { · 33 unmodified lines
34 randconfig,34 randconfig,
35 defconfig,35 defconfig,
36 nonint_oldconfig,36 nonint_oldconfig,
37 loose_nonint_oldconfig,37 oldnoconfig,
38} input_mode = oldaskconfig;38} input_mode = oldaskconfig;
39 39
40char *defconfig_file;40char *defconfig_file;
@@ -367,7 +367,7 @@ static void conf(struct menu *menu) · 326 unmodified lines
367 case P_MENU:367 case P_MENU:
368 if ((input_mode == silentoldconfig ||368 if ((input_mode == silentoldconfig ||
369 input_mode == nonint_oldconfig ||369 input_mode == nonint_oldconfig ||
370 input_mode == loose_nonint_oldconfig) &&370 input_mode == oldnoconfig) &&
371 rootEntry != menu) {371 rootEntry != menu) {
372 check_conf(menu);372 check_conf(menu);
373 return;373 return;
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu) · 53 unmodified lines
427 if (sym_is_changable(sym) ||427 if (sym_is_changable(sym) ||
428 (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {428 (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
429 if (input_mode == nonint_oldconfig ||429 if (input_mode == nonint_oldconfig ||
430 input_mode == loose_nonint_oldconfig) {430 input_mode == oldnoconfig) {
431 if (input_mode == nonint_oldconfig &&431 if (input_mode == nonint_oldconfig &&
432 sym->name && !sym_is_choice_value(sym)) {432 sym->name && !sym_is_choice_value(sym)) {
433 if (!unset_variables)433 if (!unset_variables)
@@ -460,7 +460,7 @@ static struct option long_opts[] = { · 26 unmodified lines
460 {"allmodconfig", no_argument, NULL, allmodconfig},460 {"allmodconfig", no_argument, NULL, allmodconfig},
461 {"randconfig", no_argument, NULL, randconfig},461 {"randconfig", no_argument, NULL, randconfig},
462 {"nonint_oldconfig", no_argument, NULL, nonint_oldconfig},462 {"nonint_oldconfig", no_argument, NULL, nonint_oldconfig},
463 {"loose_nonint_oldconfig", no_argument, NULL, loose_nonint_oldconfig},463 {"oldnoconfig", no_argument, NULL, oldnoconfig},
464 {NULL, 0, NULL, 0}464 {NULL, 0, NULL, 0}
465};465};
466 466
@@ -540,7 +540,7 @@ int main(int ac, char **av) · 73 unmodified lines
540 case oldaskconfig:540 case oldaskconfig:
541 case oldconfig:541 case oldconfig:
542 case nonint_oldconfig:542 case nonint_oldconfig:
543 case loose_nonint_oldconfig:543 case oldnoconfig:
544 conf_read(NULL);544 conf_read(NULL);
545 break;545 break;
546 case allnoconfig:546 case allnoconfig:
@@ -603,7 +603,7 @@ int main(int ac, char **av) · 56 unmodified lines
603 input_mode = silentoldconfig;603 input_mode = silentoldconfig;
604 /* fall through */604 /* fall through */
605 case nonint_oldconfig:605 case nonint_oldconfig:
606 case loose_nonint_oldconfig:606 case oldnoconfig:
607 case silentoldconfig:607 case silentoldconfig:
608 /* Update until a loop caused no more changes */608 /* Update until a loop caused no more changes */
609 do {609 do {
@@ -611,7 +611,7 @@ int main(int ac, char **av) · 1 unmodified line
611 check_conf(&rootmenu);611 check_conf(&rootmenu);
612 } while (conf_cnt &&612 } while (conf_cnt &&
613 (input_mode != nonint_oldconfig &&613 (input_mode != nonint_oldconfig &&
614 input_mode != loose_nonint_oldconfig));614 input_mode != oldnoconfig));
615 break;615 break;
616 }616 }
617 617