Reorganize configs to even more logical positions

2 files changed, 54 insertions, 17 deletions

diff --git a/package/Config.in b/package/Config.in
index 14474afe7..924937f02 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2,10 +2,60 @@ menu "Package Selection for the target"
 
 
 comment "The default minimal system"
-source "package/busybox/Config.in"
+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
+
 source "package/bash/Config.in"
 source "package/bzip2/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
@@ -114,6 +164,7 @@ 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 be2306f68..72f17707d 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,3 +1,5 @@
+
+
 config BR2_PACKAGE_BUSYBOX
 	bool "BusyBox"
 	default y
@@ -119,22 +121,6 @@ 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