X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbusybox%2FConfig.in;h=1002a5a0d6bd5c9e81ab51881e8db4dcd826830a;hb=fb81ddaac3c9aeef1e31f6dfc1f6293ec54d61c0;hp=9420f53694ef9bddf4a8df37f780e0684f78196d;hpb=5bc5db15ec2259d2e1d5786bc1992cc0016c9900;p=openwrt-10.03%2F.git

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 9420f5369..1002a5a0d 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,19 +1,39 @@
-config BR2_PACKAGE_BUSYBOX
-	bool "busybox"
-	default y
-	help
-	  The Swiss Army Knife of embedded Linux.  It slices, it dices, it
-	  makes Julian Fries.
+menu "Configuration"
+	depends on PACKAGE_busybox
 
-	  http://busybox.net/
+config BUSYBOX_CONFIG_FEATURE_DEVFS
+	bool
+	default y if LINUX_2_4
+	default n if LINUX_2_6
 
-	  Most people will answer Y.
+config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
+	bool
+	default y if LINUX_2_4
+	default n if LINUX_2_6
 
-config BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	bool "Use the daily snapshot of busybox?"
-	depends BR2_PACKAGE_BUSYBOX
-	default n
-	help
-	  Use the latest busybox CVS snapshot instead of release.
+config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
+	bool
+	default n if LINUX_2_4
+	default y if LINUX_2_6
 
-	  For fun, you should say Y.
+config BUSYBOX_CONFIG_NOMMU
+	bool
+	depends NOMMU
+	default y if NOMMU
+	deselect BUSYBOX_CONFIG_ASH
+	deselect BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+	deselect BUSYBOX_CONFIG_LOCK
+
+config CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
+	bool
+	default y if NOMMU
+	default n if !NOMMU
+
+config BUSYBOX_CONFIG_HUSH
+	bool
+	default y if NOMMU
+	default n if !NOMMU
+
+source "package/busybox/config/Config.in"
+
+endmenu