ahill/toybox
1
0
Fork 0
mirror of https://codeberg.org/landley/toybox.git synced 2026-01-26 14:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mkroot.

Browse Source 
"make defconfig" calls kconfig twice, and the first one (kconfig -h)
was consuming the KCONFIG_ALLCONFIG=<(echo blah) input so the actual
defconfig generation (kconfig -d) didn't see the PENDING overrides.
This commit is contained in:
Rob Landley 2025-07-01 17:24:47 -05:00
parent 9d27aba79e
commit 1ed82ade2f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/kconfig.c
View File

@ -280,6 +280,21 @@ void options(char *opt)
char *ss, *tt, *esc = "\n\\\"";
FILE *fp;
if (!strcmp(opt, "-h")) {
for (kk = kc; kk; kk = kk->next) {
if (!kk->symbol || !kk->help) continue;
printf("#define HELP_");
for (ss = kk->symbol; *ss; ss++) putchar(tolower(*ss));
printf(" \"");
for (ss = kk->help; *ss; ss++)
if (!(tt = strchr(esc, *ss))) putchar(*ss);
else printf("\\%c", "n\\\""[tt-esc]);
printf("\"\n\n");
}
return;
}
if ((ss = getenv("KCONFIG_ALLCONFIG"))) {
if (!(fp = fopen(ss, "r")))
exit(dprintf(2, "bad KCONFIG_ALLCONFIG=%s\n", ss)|1);
@ -288,16 +303,7 @@ void options(char *opt)
// TODO if ((fp = fopen(getenv("KCONFIG_CONFIG") ? : ".config")))
// read_dotconfig(kc, fp);
if (!strcmp(opt, "-h")) for (kk = kc; kk; kk = kk->next) {
if (!kk->symbol || !kk->help) continue;
printf("#define HELP_");
for (ss = kk->symbol; *ss; ss++) putchar(tolower(*ss));
printf(" \"");
for (ss = kk->help; *ss; ss++)
if (!(tt = strchr(esc, *ss))) putchar(*ss);
else printf("\\%c", "n\\\""[tt-esc]);
printf("\"\n\n");
} else if (-1 != (cfgtype = strany(opt, (char *[]){"-n", "-d", "-y", 0})-1)) {
if (-1 != (cfgtype = strany(opt, (char *[]){"-n", "-d", "-y", 0})-1)) {
time_t t = time(0);
struct tm *tt = localtime(&t);
char buf[64];