emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tito is using broken kernel headers that pollute the namespace with every

Browse Source 
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.
This commit is contained in:
Rob Landley 2005-12-06 22:48:29 +00:00
parent a62b0e7459
commit 02bab6869e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/applets.h
View File

@ -673,7 +673,7 @@
#ifdef CONFIG_TOUCH #ifdef CONFIG_TOUCH
APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER) APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_TR #if ENABLE_TR
APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_TRACEROUTE #ifdef CONFIG_TRACEROUTE
@ -736,7 +736,7 @@
#ifdef CONFIG_WATCH #ifdef CONFIG_WATCH
APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER) APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_WATCHDOG #if ENABLE_WATCHDOG
APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_WC #ifdef CONFIG_WC