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

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index e79aef7d3..1002a5a0d 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,32 +1,39 @@
-menu "busybox........................... The Swiss Army Knife of embedded Linux"
+menu "Configuration"
+	depends on PACKAGE_busybox
 
-config BR2_PACKAGE_BUSYBOX
-	prompt "busybox........................... The Swiss Army Knife of embedded Linux"
+config BUSYBOX_CONFIG_FEATURE_DEVFS
 	bool
-	default y
-	help
-	  The Swiss Army Knife of embedded Linux.  It slices, it dices, it
-	  makes Julian Fries.
-	  
-	  http://busybox.net/
-	  
-	  Most people will answer Y.
-
-config BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	bool "Use the daily snapshot of busybox?"
-	depends BR2_PACKAGE_BUSYBOX
-	depends CONFIG_DEVEL
-	default n
-	help
-	  Use the latest busybox CVS snapshot instead of release.
-	  
-	  For fun, you should say Y.
-
-menu "Busybox Configuration"
-	depends BR2_PACKAGE_BUSYBOX
-
-source package/busybox/config/Config.in
+	default y if LINUX_2_4
+	default n if LINUX_2_6
 
-endmenu
+config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
+	bool
+	default y if LINUX_2_4
+	default n if LINUX_2_6
+
+config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
+	bool
+	default n if LINUX_2_4
+	default y if LINUX_2_6
+
+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