X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/868724a7edc0cdb35c4c2180a02734e28ec7dcea..7ec88f88f4c65a22b3b7e32ef87cb42dcb32a6fb:/package/busybox/Config.in?ds=sidebyside

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 4a8fb4ea0..1002a5a0d 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,27 +1,39 @@
-config BR2_PACKAGE_BUSYBOX
-	bool "busybox - The Swiss Army Knife of embedded Linux"
-	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
+menu "Configuration"
+	depends on PACKAGE_busybox
+
+config BUSYBOX_CONFIG_FEATURE_DEVFS
+	bool
+	default y if LINUX_2_4
+	default n if LINUX_2_6
+
+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