buildsystem: rearrange main config options, reorder, move stripping items to a "Stripping options" subsection,

SVN-Revision: 21239

Config.in

@@ -13,7 +13,8 @@ config HAVE_DOT_CONFIG
 source "target/Config.in"
 
 menu "Target Images"
-	config TARGET_ROOTFS_INITRAMFS
+
+	menuconfig TARGET_ROOTFS_INITRAMFS
 		bool "ramdisk"
 		default y if USES_INITRAMFS
 		depends LINUX_2_6
@@ -21,44 +22,38 @@ menu "Target Images"
 		  Embed the rootfs into the kernel (initramfs)
 
 		choice
-		prompt "ramdisk compression"
+			prompt "Compression"
-		depends TARGET_ROOTFS_INITRAMFS
-		depends !LINUX_2_6_25
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
 			default TARGET_INITRAMFS_COMPRESSION_NONE
+			depends TARGET_ROOTFS_INITRAMFS
+			depends !LINUX_2_6_25
 			help
 			  Select ramdisk compression.
 
 			config TARGET_INITRAMFS_COMPRESSION_NONE
-			bool "NONE"
+				bool "none"
 
 			config TARGET_INITRAMFS_COMPRESSION_GZIP
-			bool "GZIP"
+				bool "gzip"
 
 			config TARGET_INITRAMFS_COMPRESSION_BZIP2
-			bool "BZIP2"
+				bool "bzip2"
 
 			config TARGET_INITRAMFS_COMPRESSION_LZMA
-			bool "LZMA"
+				bool "lzma"
 
 			config TARGET_INITRAMFS_COMPRESSION_LZO
-			bool "LZO"
+				bool "lzo"
 		endchoice
 
-	config TARGET_ROOTFS_JFFS2
+	comment "Root filesystem archives"
-		bool "jffs2"
-		default y if USES_JFFS2
-		depends !TARGET_ROOTFS_INITRAMFS
-		help
-		  Build a jffs2 root filesystem
 
-	config TARGET_ROOTFS_SQUASHFS
+	config TARGET_ROOTFS_CPIOGZ
-		bool "squashfs"
+		bool "cpio.gz"
-		default y if USES_SQUASHFS
+		default y if USES_CPIOGZ
-		depends !TARGET_ROOTFS_INITRAMFS
 		help
-		  Build a squashfs-lzma root filesystem
+		  Build a compressed cpio archive of the the root filesystem
 
 	config TARGET_ROOTFS_TARGZ
 		bool "tar.gz"
@@ -66,11 +61,7 @@ menu "Target Images"
 		help
 		  Build a compressed tar archive of the the root filesystem
 
-	config TARGET_ROOTFS_CPIOGZ
+	comment "Root filesystem images"
-		bool "cpio.gz"
-		default y if USES_CPIOGZ
-		help
-		  Build a compressed cpio archive of the the root filesystem
 
 	config TARGET_ROOTFS_EXT2FS
 		bool "ext2"
@@ -86,6 +77,20 @@ menu "Target Images"
 		help
 		  Create some bootable ISO image
 
+	config TARGET_ROOTFS_JFFS2
+		bool "jffs2"
+		default y if USES_JFFS2
+		depends !TARGET_ROOTFS_INITRAMFS
+		help
+		  Build a jffs2 root filesystem
+
+	config TARGET_ROOTFS_SQUASHFS
+		bool "squashfs"
+		default y if USES_SQUASHFS
+		depends !TARGET_ROOTFS_INITRAMFS
+		help
+		  Build a squashfs-lzma root filesystem
+
 	config TARGET_ROOTFS_UBIFS
 		bool "ubifs"
 		default y if USES_UBIFS
@@ -93,56 +98,106 @@ menu "Target Images"
 		help
 		  Build a ubifs root filesystem
 
-comment "Image Options"
+	comment "Image Options"
 
-source "target/linux/*/image/Config.in"
+	source "target/linux/*/image/Config.in"
 
 	config TARGET_ROOTFS_FSPART
-        int "Filesystem part size (in MB)"
+		int "Root filesystem partition size (in MB)"
-        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532 || TARGET_olpc
+		depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532
 		default 48
 		help
-            Allows you to change the filesystem partition size
+		    Allows you to change the root filesystem partition size
 
 	config TARGET_ROOTFS_MAXINODE
-        int "Maximum number of inodes in filesystem"
+		int "Maximum number of inodes in root filesystem"
 		depends TARGET_ROOTFS_EXT2FS
 		default 6000
 		help
-            Allows you to change the maximum number of inodes in the filesystem
+		    Allows you to change the maximum number of inodes in the root filesystem
 
 endmenu
 
 menu "Global build settings"
 
-config ALL
+	config ALL
 		bool "Select all packages by default"
 		default n
 
-comment "General build options"
+	comment "General build options"
 
-config CLEAN_IPKG
+	config BUILD_PATENTED
-	bool
+		default y
-	prompt "Disable ipkg/opkg installation on the target"
+		bool "Compile with support for patented functionality"
-	default n
 		help
-		This removes all ipkg data from the target directory before building the root fs
+		  When this option is disabled, software which provides patented functionality will not be built.
+		  In case software provides optional support for patented functionality,
+		  this optional support will get disabled for this package.
 
-config LARGEFILE
+	config LARGEFILE
 		bool
 		prompt "Enable large file (files > 2 GB) support"
 		default y
 		help
 		  Enable large file (files > 2 GB) support.
 
-config SHADOW_PASSWORDS
+	config SHADOW_PASSWORDS
 		bool
 		prompt "Enable shadow password support"
 		default y
 		help
 		  Enable shadow password support.
 
-choice
+	config CLEAN_IPKG
+		bool
+		prompt "Remove ipkg/opkg status data files in final images"
+		default n
+		help
+			This removes all ipkg/opkg status data files from the target directory before building the root fs
+
+	comment "Kernel build options"
+
+	config KERNEL_DEBUG_FS
+		bool "Compile the kernel with Debug FileSystem enabled"
+		default y
+		depends LINUX_2_6
+		help
+		  debugfs is a virtual file system that kernel developers use to put
+		  debugging files into. Enable this option to be able to read and
+		  write to these files.
+
+	config KERNEL_PROFILING
+		bool "Compile the kernel with profiling enabled"
+		default n
+		help
+		  Enable the extended profiling support mechanisms used by profilers such
+		  as OProfile.
+
+	config KERNEL_KALLSYMS
+		bool "Compile the kernel with symbol table information"
+		default n
+		help
+		  This will give you more information in stack traces from kernel oopses
+
+	comment "Package build options"
+
+	config DEBUG
+		bool
+		prompt "Compile packages with debugging info"
+		default n
+		help
+		  Adds -g3 to the CFLAGS
+
+	config IPV6
+		bool
+		prompt "Enable IPv6 support in packages"
+		default n
+		help
+		  Enable IPV6 support in packages (passes --enable-ipv6 to configure scripts).
+
+	comment "Stripping options"
+
+	choice
 		prompt "Binary stripping method"
 		default USE_STRIP   if EXTERNAL_TOOLCHAIN
 		default USE_STRIP   if USE_GLIBC || USE_EGLIBC
@@ -168,17 +223,9 @@ choice
 			depends !USE_EGLIBC
 			help
 			  This will install binaries stripped using sstrip
-endchoice
+	endchoice
 
-config BUILD_PATENTED
+	config STRIP_ARGS
-	default y
-	bool "Compile with support for patented functionality"
-	help
-	  When this option is disabled, software which provides patented functionality will not be built.
-	  In case software provides optional support for patented functionality,
-	  this optional support will get disabled for this package.
-
-config STRIP_ARGS
 		string
 		prompt "Strip arguments"
 		depends USE_STRIP
@@ -187,15 +234,7 @@ config STRIP_ARGS
 		help
 		  Specifies arguments passed to the strip command when stripping binaries
 
-config USE_MKLIBS
+	config STRIP_KERNEL_EXPORTS
-	bool "Strip unnecessary functions from libraries"
-	help
-	  Reduces libraries to only those functions that are necessary for using all
-	  selected packages (including those selected as <M>)
-	  Note that this will make the system libraries incompatible with most of the packages
-	  that are not selected during the build process
-
-config STRIP_KERNEL_EXPORTS
 		depends LINUX_2_6
 		bool "Strip unnecessary exports from the kernel image"
 		help
@@ -203,45 +242,13 @@ config STRIP_KERNEL_EXPORTS
 		  Note that this might make the kernel incompatible with any kernel modules that
 		  were not selected at the time the kernel image was created
 
-comment "Package build options"
+	config USE_MKLIBS
-
+		bool "Strip unnecessary functions from libraries"
-config DEBUG
-	bool
-	prompt "Compile packages with debugging info"
-	default n
 		help
-		Adds -g3 to the CFLAGS
+		  Reduces libraries to only those functions that are necessary for using all
-
+		  selected packages (including those selected as <M>)
-config IPV6
+		  Note that this will make the system libraries incompatible with most of the packages
-        bool
+		  that are not selected during the build process
-        prompt "Enable IPv6 support in packages"
-        default n
-        help
-                Enable IPV6 support in packages (passes --enable-ipv6 to configure scripts).
-
-comment "Kernel build options"
-
-config KERNEL_KALLSYMS
-	bool "Compile the kernel with symbol table information"
-	default n
-	help
-		This will give you more information in stack traces from kernel oopses
-
-config KERNEL_PROFILING
-	bool "Compile the kernel with profiling enabled"
-	default n
-	help
-		Enable the extended profiling support mechanisms used by profilers such
-		as OProfile.
-
-config KERNEL_DEBUG_FS
-	bool "Compile the kernel with Debug Filesystem enabled"
-	depends LINUX_2_6
-	default y
-	help
-		debugfs is a virtual file system that kernel developers use to put
-		debugging files into. Enable this option to be able to read and
-		write to these files.
 
 endmenu
 
@@ -249,57 +256,49 @@ menuconfig DEVEL
 	bool "Advanced configuration options (for developers)"
 	default n
 
-config BROKEN
+	config BROKEN
-	bool
+		bool "Show broken platforms / packages" if DEVEL
-	prompt "Show broken platforms / packages" if DEVEL
 		default n
 
-config DOWNLOAD_FOLDER
+	config DOWNLOAD_FOLDER
-	string
+		string "Download folder" if DEVEL
-	prompt "Download folder" if DEVEL
 		default ""
 
-config LOCALMIRROR
+	config LOCALMIRROR
-	string
+		string "Local mirror for source packages" if DEVEL
-	prompt "Local mirror for source packages" if DEVEL
+		default ""
 
-config AUTOREBUILD
+	config AUTOREBUILD
-	bool
+		bool "Automatic rebuild of packages" if DEVEL
-	prompt "Automatic rebuild of packages" if DEVEL
 		default y
 		help
 		  Automatically rebuild packages when their files change
 
-config BUILD_SUFFIX
+	config BUILD_SUFFIX
-	string
+		string "Build suffix to append to the BUILD_DIR variable" if DEVEL
-	prompt "Build suffix to append to the BUILD_DIR variable" if DEVEL
 		default ""
 		help
 		  Build suffix to append to the BUILD_DIR variable, i.e: build_dir_suffix
 
-config TARGET_ROOTFS_DIR
+	config TARGET_ROOTFS_DIR
-	string
+		string "Override the default TARGET_ROOTFS_DIR variable" if DEVEL
-	prompt "Override the default TARGET_ROOTFS_DIR variable" if DEVEL
 		default ""
 		help
 		  Override the default TARGET_ROOTFS_DIR variable content $(BUILD_DIR) with custom path.
 		  Use this option to re-define the location of the target root file system directory.
 
-config CCACHE
+	config CCACHE
-	bool
+		bool "Use ccache" if DEVEL
-	prompt "Use ccache" if DEVEL
 		default n
 		help
 		  Compiler cache; see http://ccache.samba.org/
 
-config EXTERNAL_KERNEL_TREE
+	config EXTERNAL_KERNEL_TREE
-	string
+		string "Use external kernel tree" if DEVEL
-	prompt "Use external kernel tree" if DEVEL
 		default ""
 
-config KERNEL_GIT_CLONE_URI
+	config KERNEL_GIT_CLONE_URI
-	string
+		string "Enter git repository to clone" if DEVEL
-	prompt "Enter git repository to clone" if DEVEL
 		default ""
 		help
 		  Enter the full git repository path i.e.:
@@ -307,29 +306,25 @@ config KERNEL_GIT_CLONE_URI
 		  This will create a git clone of the kernel in your build
 		  directory.
 
-config KERNEL_GIT_LOCAL_REPOSITORY
+	config KERNEL_GIT_LOCAL_REPOSITORY
-	string
+		string "Enter path to local reference repository" if DEVEL
-	prompt "Enter path to local reference repository" if DEVEL
 		default ""
 		help
 		  Enter a full pathname to a local reference git repository.
 		  In this instance, the --refererence option of git clone will
 		  be used thus creating a quick local clone of your repo.
 
-
 menuconfig TARGET_OPTIONS
 	bool "Target Options"  if DEVEL
 
-config TARGET_OPTIMIZATION
+	config TARGET_OPTIMIZATION
-	string
+		string "Target Optimizations" if TARGET_OPTIONS
-	prompt "Target Optimizations" if TARGET_OPTIONS
 		default DEFAULT_TARGET_OPTIMIZATION
 		help
 		  Optimizations to use when building for the target host.
 
-config SOFT_FLOAT
+	config SOFT_FLOAT
-	bool
+		bool "Use software floating point by default" if TARGET_OPTIONS
-	prompt "Use software floating point by default" if TARGET_OPTIONS
 		default y
 		depends on (arm || armeb || powerpc || mipsel || mips) && !HAS_FPU
 		help
@@ -340,7 +335,6 @@ config SOFT_FLOAT
 
 		  Most people will answer N.
 
-
 source "toolchain/Config.in"
 
 source "target/imagebuilder/Config.in"
@@ -348,5 +342,3 @@ source "target/sdk/Config.in"
 source "target/toolchain/Config.in"
 
 source "tmp/.config-package.in"
-
-