diff options
| author | Rob Landley <rob@landley.net> | 2005-12-06 22:48:29 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2005-12-06 22:48:29 +0000 |
| commit | 02bab6869e274ab643b8e370f4e3f14cdc5edbaf (patch) | |
| tree | 236676a875a198de738ff9031a2df054069ebfb8 /include | |
| parent | a62b0e7459b376d0c02c31ad250329e4da67618d (diff) | |
| download | busybox-w32-02bab6869e274ab643b8e370f4e3f14cdc5edbaf.tar.gz busybox-w32-02bab6869e274ab643b8e370f4e3f14cdc5edbaf.tar.bz2 busybox-w32-02bab6869e274ab643b8e370f4e3f14cdc5edbaf.zip | |
Tito is using broken kernel headers that pollute the namespace with every
CONFIG_ symbol in the kernel, and this clashes with busybox's CONFIG_TR
and CONFIG_WATCHDOG, causing applets.h to barf if they're not switched
on (since the broken headers don't affect kconfig or the makefiles).
Since such broken kernel headers are common enough to crop up every few
months, a simple work around is to move TR and WATCHDOG from CONFIG_
to ENABLE_ early.
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/applets.h b/include/applets.h index ec3a892d0..79d18207e 100644 --- a/include/applets.h +++ b/include/applets.h | |||
| @@ -673,7 +673,7 @@ | |||
| 673 | #ifdef CONFIG_TOUCH | 673 | #ifdef CONFIG_TOUCH |
| 674 | APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER) | 674 | APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER) |
| 675 | #endif | 675 | #endif |
| 676 | #ifdef CONFIG_TR | 676 | #if ENABLE_TR |
| 677 | APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | 677 | APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) |
| 678 | #endif | 678 | #endif |
| 679 | #ifdef CONFIG_TRACEROUTE | 679 | #ifdef CONFIG_TRACEROUTE |
| @@ -736,7 +736,7 @@ | |||
| 736 | #ifdef CONFIG_WATCH | 736 | #ifdef CONFIG_WATCH |
| 737 | APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER) | 737 | APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER) |
| 738 | #endif | 738 | #endif |
| 739 | #ifdef CONFIG_WATCHDOG | 739 | #if ENABLE_WATCHDOG |
| 740 | APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER) | 740 | APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER) |
| 741 | #endif | 741 | #endif |
| 742 | #ifdef CONFIG_WC | 742 | #ifdef CONFIG_WC |