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