package/mac80211: fix atomic64 issues on x86 / uml

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

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index e79aef7..407e95e 100644 (file)
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,32 +1,29 @@
-menu "busybox........................... The Swiss Army Knife of embedded Linux"
 
-config BR2_PACKAGE_BUSYBOX
-       prompt "busybox........................... The Swiss Army Knife of embedded Linux"
+if PACKAGE_busybox
+
+config BUSYBOX_CONFIG_NOMMU
        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.
+       depends NOMMU
+       default y if NOMMU
+       deselect BUSYBOX_CONFIG_ASH
+       deselect BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+       deselect BUSYBOX_CONFIG_LOCK
 
-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.
+config CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
+       bool
+       default y if NOMMU
+       default n if !NOMMU
 
-menu "Busybox Configuration"
-       depends BR2_PACKAGE_BUSYBOX
+config BUSYBOX_CONFIG_HUSH
+       bool
+       default y if NOMMU
+       default n if !NOMMU
 
-source package/busybox/config/Config.in
+config BUSYBOX_USE_LIBRPC
+       bool
+       depends USE_UCLIBC
+       default y if BUSYBOX_CONFIG_FEATURE_HAVE_RPC
 
-endmenu
+source "package/busybox/config/Config.in"
 
-endmenu
+endif