diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-08-27 16:10:53 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-08-27 16:10:53 +0100 |
| commit | 3fd34651ea72ea1c335d3170f234cb0517fd897f (patch) | |
| tree | 36e8fc40cffd464ffda4759020777dd3ca23ca31 /scripts | |
| parent | e3ac39098326de084a805d0dd31db9666b734f20 (diff) | |
| parent | d6ae4fb446daedfe3073d67be655942e9fa7eb18 (diff) | |
| download | busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.gz busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.bz2 busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/confdata.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index bd2d70e19..303df0be7 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -474,7 +474,11 @@ int conf_write(const char *name) | |||
| 474 | fprintf(out_h, "#define CONFIG_%s 1\n", sym->name); | 474 | fprintf(out_h, "#define CONFIG_%s 1\n", sym->name); |
| 475 | /* bbox */ | 475 | /* bbox */ |
| 476 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); | 476 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); |
| 477 | fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); | 477 | fprintf(out_h, "#ifdef MAKE_SUID\n"); |
| 478 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); | ||
| 479 | fprintf(out_h, "#else\n"); | ||
| 480 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); | ||
| 481 | fprintf(out_h, "#endif\n"); | ||
| 478 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); | 482 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); |
| 479 | } | 483 | } |
| 480 | break; | 484 | break; |
| @@ -506,7 +510,11 @@ int conf_write(const char *name) | |||
| 506 | fputs("\"\n", out_h); | 510 | fputs("\"\n", out_h); |
| 507 | /* bbox */ | 511 | /* bbox */ |
| 508 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); | 512 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); |
| 509 | fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); | 513 | fprintf(out_h, "#ifdef MAKE_SUID\n"); |
| 514 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); | ||
| 515 | fprintf(out_h, "#else\n"); | ||
| 516 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); | ||
| 517 | fprintf(out_h, "#endif\n"); | ||
| 510 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); | 518 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); |
| 511 | } | 519 | } |
| 512 | break; | 520 | break; |
| @@ -518,7 +526,11 @@ int conf_write(const char *name) | |||
| 518 | fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str); | 526 | fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str); |
| 519 | /* bbox */ | 527 | /* bbox */ |
| 520 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); | 528 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); |
| 521 | fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); | 529 | fprintf(out_h, "#ifdef MAKE_SUID\n"); |
| 530 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); | ||
| 531 | fprintf(out_h, "#else\n"); | ||
| 532 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); | ||
| 533 | fprintf(out_h, "#endif\n"); | ||
| 522 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); | 534 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); |
| 523 | } | 535 | } |
| 524 | break; | 536 | break; |
| @@ -532,7 +544,11 @@ int conf_write(const char *name) | |||
| 532 | fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str); | 544 | fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str); |
| 533 | /* bbox */ | 545 | /* bbox */ |
| 534 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); | 546 | fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); |
| 535 | fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); | 547 | fprintf(out_h, "#ifdef MAKE_SUID\n"); |
| 548 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); | ||
| 549 | fprintf(out_h, "#else\n"); | ||
| 550 | fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); | ||
| 551 | fprintf(out_h, "#endif\n"); | ||
| 536 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); | 552 | fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); |
| 537 | } | 553 | } |
| 538 | break; | 554 | break; |