svn commit: trunk/busybox/include

landley at busybox.net landley at busybox.net
Tue Dec 6 22:48:30 UTC 2005


Author: landley
Date: 2005-12-06 14:48:29 -0800 (Tue, 06 Dec 2005)
New Revision: 12707

Log:
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.


Modified:
   trunk/busybox/include/applets.h


Changeset:
Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h	2005-12-06 22:12:15 UTC (rev 12706)
+++ trunk/busybox/include/applets.h	2005-12-06 22:48:29 UTC (rev 12707)
@@ -673,7 +673,7 @@
 #ifdef CONFIG_TOUCH
 	APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_TR
+#if ENABLE_TR
 	APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_TRACEROUTE
@@ -736,7 +736,7 @@
 #ifdef CONFIG_WATCH
 	APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_WATCHDOG
+#if ENABLE_WATCHDOG
 	APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_WC




More information about the busybox-cvs mailing list