[backfire] firewall: merge r28535

[openwrt-10.03/.git] / package / busybox / Config.in

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 320cb9b1c076e24d27603a21795159311803bf0c..1002a5a0d6bd5c9e81ab51881e8db4dcd826830a 100644 (file)
--- 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 y
-       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