- revert patch that obfuscates the config UI and doesn't reflect the order of config steps

2 files changed, 17 insertions, 54 deletions

diff --git a/package/Config.in b/package/Config.in
index 924937f027..14474afe7b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2,60 +2,10 @@ menu "Package Selection for the target"
 
 
 comment "The default minimal system"
-menuconfig BR2_CONFIG_SKELETON
-	bool "Skeleton configuration"
-	default y
-	help
-	  Configuration of target skeleton
-
-if BR2_CONFIG_SKELETON
-config BR2_HOSTNAME
-	string "hostname"
-	default "uclibc"
-	help
-	  The hostname string is stored in "/etc/hostname"
-
-config BR2_BANNER
-	string "banner"
-	default "Welcome to the Erik's uClibc development environment."
-	help
-	  The banner string is stored in "/etc/issue"
-
-config BR2_PACKAGE_BUSYBOX_SKELETON
-	bool "use minimal target skeleton"
-	depends on BR2_PACKAGE_BUSYBOX
-	depends on !BR2_BUSYBOX_VERSION_1_0_1
-	help
-	  Use a minimal target skeleton. Make sure to select mdev
-	  which is used to populate /dev/.
-endif
-
-menuconfig BR2_MINIMAL
-	bool "Busybox configuration (required)"
-	default y
-	help
-	  Busybox Support
-
-if BR2_MINIMAL
 source "package/busybox/Config.in"
-endif
-config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-	bool "Hide applications that are provided by busybox"
-	depends on BR2_PACKAGE_BUSYBOX
-	default y if BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	help
-	  Do not show packages in menuconfig that are potentially provided
-	  by busybox.
-comment "The minimum needed to build a uClibc development system"
 
-menuconfig BR2_APPLICATIONS
-	bool "General purpose applications"
-	default y
-	help
-	  Support for miscellaneous packages
-
-if BR2_APPLICATIONS
 
+comment "The minimum needed to build a uClibc development system"
 source "package/bash/Config.in"
 source "package/bzip2/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
@@ -164,7 +114,6 @@ endif
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/which/Config.in"
 endif
-endif
 
 menuconfig BR2_NETWORK_SUPPORT
 	bool "Networking"
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 72f17707d0..be2306f686 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,5 +1,3 @@
-
-
 config BR2_PACKAGE_BUSYBOX
 	bool "BusyBox"
 	default y
@@ -121,6 +119,22 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
 
 	  Most people will just use the default BusyBox configuration file.
 
+config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+	bool "Hide applications that are provided by busybox"
+	depends on BR2_PACKAGE_BUSYBOX
+	default y if BR2_PACKAGE_BUSYBOX_SNAPSHOT
+	help
+	  Do not show packages in menuconfig that are potentially provided
+	  by busybox.
+
+config BR2_PACKAGE_BUSYBOX_SKELETON
+	bool "use minimal target skeleton"
+	depends on BR2_PACKAGE_BUSYBOX
+	depends on !BR2_BUSYBOX_VERSION_1_0_1
+	help
+	  Use a minimal target skeleton. Make sure to select mdev
+	  which is used to populate /dev/.
+
 #config BR2_PACKAGE_BUSYBOX_INITRAMFS
 #	bool "initramfs perusing busybox"
 #	depends on BR2_PACKAGE_BUSYBOX