summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2005-12-06 22:48:29 +0000
committerRob Landley2005-12-06 22:48:29 +0000
commit02bab6869e274ab643b8e370f4e3f14cdc5edbaf (patch)
tree236676a875a198de738ff9031a2df054069ebfb8
parenta62b0e7459b376d0c02c31ad250329e4da67618d (diff)
downloadbusybox-02bab6869e274ab643b8e370f4e3f14cdc5edbaf.zip
busybox-02bab6869e274ab643b8e370f4e3f14cdc5edbaf.tar.gz
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.
-rw-r--r--include/applets.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/applets.h b/include/applets.h
index ec3a892..79d1820 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -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