Merge branch 'origin/master' (early part)

1 files changed, 13 insertions, 1 deletions

diff --git a/Config.in b/Config.in
index 0a90f6a8a..21c28e667 100644
--- a/Config.in
+++ b/Config.in
@@ -29,7 +29,7 @@ menu "General Configuration"
 
 config DESKTOP
         bool "Enable options for full-blown desktop systems"
-        default n
+        default y
         help
           Enable options and features which are not essential.
           Select this only if you plan to use busybox on full-blown
@@ -61,6 +61,17 @@ config USE_PORTABLE_CODE
           compiler other than gcc.
           If you do use gcc, this option may needlessly increase code size.
 
+config PLATFORM_LINUX
+        bool "Enable Linux-specific applets and features"
+        default y
+        help
+          For the most part, busybox requires only POSIX compatibility
+          from the target system, but some applets and features use
+          Linux-specific interfaces.
+
+          Answering 'N' here will disable such applets and hide the
+          corresponding configuration options.
+
 choice
         prompt "Buffer allocation policy"
         default FEATURE_BUFFERS_USE_MALLOC
@@ -367,6 +378,7 @@ config FEATURE_SUID_CONFIG_QUIET
 config SELINUX
         bool "Support NSA Security Enhanced Linux"
         default n
+        depends on PLATFORM_LINUX
         help
           Enable support for SELinux in applets ls, ps, and id. Also provide
           the option of compiling in SELinux applets.