Rearranged menuconfig layout.

Config.in

@@ -1,4 +1,6 @@
-mainmenu "JHALFS Build Script Configuration"
+menu "--- BOOK Settings"
+
+	#--- BOOK/script
 	choice
 		prompt "Use BOOK"
 		default BOOK_LFS
@@ -7,17 +9,23 @@ mainmenu "JHALFS Build Script Configuration"
 
 		config	BOOK_LFS
 			bool "Linux From Scratch"
+
 		config	BOOK_CLFS
 			bool "Cross-Compiled Linux From Scratch"
+
 		config	BOOK_CLFS2
 			bool "Cross-Compiled Linux From Scratch (Version 2)"
+
 #		config	BOOK_CLFS3
 #			bool "Cross-Compiled Linux From Scratch (Embedded Systems)"
+
 		config	BOOK_HLFS
 			bool "Hardened Linux From Scratch"
+
 #		config	BOOK_BLFS
 #			bool "Beyond Linux From Scratch"
 	endchoice
+
 	config	RUN_ME
 		string
 		default	"./lfs"		if BOOK_LFS
@@ -26,11 +34,9 @@ mainmenu "JHALFS Build Script Configuration"
 #		default	"./clfs3"	if BOOK_CLFS3
 		default	"./hlfs"	if BOOK_HLFS
 #		default	"./blfs"	if BOOK_BLFS
-
+	#--- End BOOK/script
-
 
 	#--- Book version
-#menu	"Book Version"
 	choice
 		prompt	"Release"
 		default	relSVN
@@ -38,10 +44,12 @@ mainmenu "JHALFS Build Script Configuration"
 			bool	"SVN"
 			help
 				#-- Current development version as in trunk
+
 		config	WORKING_COPY
 			bool	"Working Copy"
 			help
 				#-- A local working copy
+
 		config	BRANCH
 			bool	"Branch or stable book" if !BOOK_HLFS && !BOOK_CLFS2
 			help
@@ -61,78 +69,33 @@ mainmenu "JHALFS Build Script Configuration"
 		default	"**EDIT ME**"
 		depends	WORKING_COPY
 		help
-			#--- The full path to a local copy of the book XML sources
+			#-- The full path to a local copy of the book XML sources
 			#
-#endmenu
+	#--- End BOOK version
-#-----------------------
-
-#--- Set User Account
-	config	CONFIG_USER
-		bool	"Change the default user/group for this build"
-		default	n
-		help	#--- Unprivileged user and group name
-			#    If you do not have the priv to create/delete
-			#    users and groups you can specifiy your own
-			#    user id for the build
-			#
-			# default values for each book
-			# LFS   lfs
-			# CLFS  clfs
-			# CLFS2 clfs
-			# HLFS  hlfs
-
-	config	DEF_USER
-		string
-		default	"lfs"	if BOOK_LFS
-		default	"clfs"	if BOOK_CLFS || BOOK_CLFS2
-		default "hlfs"	if BOOK_HLFS
-
-	config	SET_USER
-		string	"User account"
-		depends	CONFIG_USER
-		default	DEF_USER
-
-
-	config	CONFIG_GROUP
-		bool	"Set Group?"
-		default	n
-		depends	CONFIG_USER
-
-	config	SET_GROUP
-		string	"GROUP account"
-		depends	CONFIG_GROUP
-		default	DEF_USER
-
-	config	LUSER
-		string
-		default	DEF_USER	if !CONFIG_USER
-		default	SET_USER	if  CONFIG_USER
-
-	config	LGROUP
-		string
-		default	LUSER		if !CONFIG_GROUP
-		default	SET_GROUP	if  CONFIG_GROUP
-------------------------
-
-comment	"--------CLFS specific params---------"
-depends on BOOK_CLFS || BOOK_CLFS2
 
+	#--- CLFS specific params
 	choice
 		prompt	"Target architecture"
 		default	ARCH_X86
 		depends	BOOK_CLFS || BOOK_CLFS2
 		help
 			#-- Choose a base architecture
+
 		config	ARCH_X86
 			bool	"x86"
+
 		config	ARCH_MIPS
 			bool	"mips"	if !BOOK_CLFS2
+
 		config	ARCH_PPC
 			bool	"ppc"	if !BOOK_CLFS2
+
 		config	ARCH_SPARC
 			bool	"sparc"	if !BOOK_CLFS2
+
 		config	ARCH_ALPHA
 			bool	"alpha"	if !BOOK_CLFS2
+
 		config	ARCH_ARM
 			bool	"arm"	if !BOOK_CLFS
 	endchoice
@@ -142,10 +105,13 @@ depends on BOOK_CLFS || BOOK_CLFS2
 		depends	(BOOK_CLFS || BOOK_CLFS2)
 		default	DATA_32		if !ARCH_ALPHA
 		default	DATA_64		if ARCH_ALPHA
+
 		config	DATA_32
 			bool	"32-bit"	if !ARCH_ALPHA
+
 		config	DATA_64
 			bool	"64-bit"	if !ARCH_PPC && !ARCH_ARM && !(BOOK_CLFS2 && ARCH_X86)
+
 		config	DATA_MULTI
 			bool	"multilib"	if !ARCH_ALPHA && !ARCH_ARM && !(BOOK_CLFS2 && ARCH_X86)
 	endchoice
@@ -153,19 +119,23 @@ depends on BOOK_CLFS || BOOK_CLFS2
 	choice
 		prompt	"Target"
 		depends	(BOOK_CLFS || BOOK_CLFS2) && ((ARCH_X86 && DATA_32) || ARCH_MIPS)
+
 		config	PROC_i486
 			bool	"i486"			if ARCH_X86 && DATA_32
+
 		config	PROC_i586
 			bool	"i586"			if ARCH_X86 && DATA_32
+
 		config	PROC_i686
 			bool	"i686"			if ARCH_X86 && DATA_32
+
 		config	PROC_mipsel
 			bool	"mips -little endian"	if ARCH_MIPS
+
 		config	PROC_mips
 			bool	"mips"			if ARCH_MIPS
 	endchoice
 
-
 	config TARGET
 		string
 		depends	DATA_32
@@ -231,18 +201,20 @@ depends on BOOK_CLFS || BOOK_CLFS2
 		default	"sparc64"	if ARCH_SPARC
 		default	"ppc64"		if ARCH_PPC
 
-
 	choice
 		prompt	"Build method"
 		depends	BOOK_CLFS
 		help
-			#--- What build method should be used: a chroot jail or minimal boot system
+			#-- What build method should be used: a chroot jail or minimal boot system
 			#   Review the Cross-LFS book chap6 "TO BOOT OR CHROOT" for a full explanation.
+
 		config	BUILD_CHROOT
 			bool	"chroot"
+
 		config	BUILD_BOOT
 			bool	"boot"
 	endchoice
+
 	config	METHOD
 		string
 		default	"chroot"	if BUILD_CHROOT
@@ -253,9 +225,10 @@ depends on BOOK_CLFS || BOOK_CLFS2
 		default "***EDIT ME***"
 		depends on BUILD_BOOT
 		help
-			#--- If METHOD=boot, location of boot-kernel config file
+			#-- If METHOD=boot, location of boot-kernel config file
 			#   The config file will be copied to ${BUILD_DIR}/sources
 			#   and renamed 'bootkernel-config'
+			#
 			# NOTE: this setting is required
 
 	config	BOOT_KEYMAP
@@ -263,7 +236,7 @@ depends on BOOK_CLFS || BOOK_CLFS2
 		default "none"
 		depends on BUILD_BOOT
 		help
-			#--- Include the keymap in the kernel if defined. Path to the
+			#-- Include the keymap in the kernel if defined. Path to the
 			#   keymap file relative to /usr/share/kbd/keymaps/
 			#   (e.g., i386/qwerty/us.map.gz) or "none" if you do not want
 			#   a keymap included in the kernel
@@ -273,179 +246,151 @@ depends on BOOK_CLFS || BOOK_CLFS2
 			compiling the keymap into the kernel, you MUST manually edit the
 			"loadkeys" command found in $JHALFSDIR/clfs-commands/boot/066-kernel
 			to set the full path in your host to the keymap file.
+	#--- End CLFS specific params
 
-comment	"----------------------------------------"
+	#--- HLFS specific params
-depends on BOOK_CLFS || BOOK_CLFS2
-
-
-comment	"--------HLFS specific params---------"
-depends on BOOK_HLFS
-
 	config	GRSECURITY_HOST
 		bool	"Building on grsecurity enabled host?"
 		default	n
 		depends on BOOK_HLFS
 		help
-			#--- If your build system has grsecurity patches applied
+			#-- If your build system has grsecurity patches applied
 			#   you MUST enable this switch.
 
 	choice
 		prompt "Library"
 		depends on BOOK_HLFS
 		help
-			#--- Which library model to use: uClibc/glibc
+			#-- Which library model to use: uClibc/glibc
+
 		config	LIB_GLIBC
 			bool "glibc"
+
 		config	LIB_UCLIBC
 			bool "uClibc"
 	endchoice
+
 	config	MODEL
 		depends on BOOK_HLFS
 		string
 		default	"glibc"		if LIB_GLIBC
 		default "uclibc"	if LIB_UCLIBC
+	#--- End HLFS specific params
 
-comment	"-------------------------------------"
+#--- End BOOK Settings
-depends on BOOK_HLFS
+endmenu
 
-#-----------------------
+menu "--- General Settings"
+
+	#--- Set User Account
+	config	CONFIG_USER
+		bool	"Change the default user/group for this build"
+		default	n
+		help	#-- Unprivileged user and group name
+			#   If you do not have the priv to create/delete
+			#   users and groups you can specifiy your own
+			#   user id for the build
+			#
+			# default values for each book
+			# LFS   lfs
+			# CLFS  clfs
+			# CLFS2 clfs
+			# HLFS  hlfs
+
+	config	DEF_USER
+		string
+		default	"lfs"	if BOOK_LFS
+		default	"clfs"	if BOOK_CLFS || BOOK_CLFS2
+		default "hlfs"	if BOOK_HLFS
+
+	config	SET_USER
+		string	"User account"
+		depends	CONFIG_USER
+		default	DEF_USER
+
+
+	config	CONFIG_GROUP
+		bool	"Set Group?"
+		default	n
+		depends	CONFIG_USER
+
+	config	SET_GROUP
+		string	"GROUP account"
+		depends	CONFIG_GROUP
+		default	DEF_USER
+
+	config	LUSER
+		string
+		default	DEF_USER	if !CONFIG_USER
+		default	SET_USER	if  CONFIG_USER
+
+	config	LGROUP
+		string
+		default	LUSER		if !CONFIG_GROUP
+		default	SET_GROUP	if  CONFIG_GROUP
+	#--- End Set User Account
 
 	config BUILDDIR
 		string "Build Directory"
 		default "/mnt/build_dir"
 		help
-			#--- The directory where the created system will be located.
+			#-- The directory where the created system will be located.
-
-	config SRC_ARCHIVE
-		string "Package Archive Directory"
-		default "$SRC_ARCHIVE"
-		help
-			#--- A local archive for packages/file (not $BUILDDIR/sources)
-			#    Used only if GETPKG = 1
-			#    Any missing file will be downloaded and archived here,
-			#    if the user has the right priviledges.
-
 
 	config	CONFIG_GETPKG
 		bool "Retrieve source files"
 		default n
 		help
-			#--- Download all packages and patches required by the book selected
+			#-- Download all packages and patches required by the book selected
 			#   NOTE: Looks for files in the local archive defined by SRC_ARCHIVE
 			#   first and if necessary retrieve them from the 'net.
 			#   Files will be transfered to $BUILDDIR/sources.
 
+	config SRC_ARCHIVE
+		string "Package Archive Directory"
+		default "$SRC_ARCHIVE"
+		depends CONFIG_GETPKG
+		help
+			#-- A local archive for packages/file (not $BUILDDIR/sources)
+			#   Used only if GETPKG = 1
+			#   Any missing file will be downloaded and archived here,
+			#   if the user has the right priviledges.
+
 	config	CONFIG_GETKERNEL
 		bool	"Always retrieve kernel package"
 		default	n
+		depends CONFIG_GETPKG
 		help
-			# Get the kernel package and patches even if no configuration file
+			#-- Get the kernel package and patches even if no configuration
-			# has been supplied.
+			#   file has been supplied.
 
 	config	CONFIG_RUNMAKE
 		bool	"Run the makefile"
 		default n
 		help
-			#--- Automatically run the makefile once it has been created
+			#-- Automatically run the makefile once it has been created
 
 	config	CONFIG_REBUILD
 		bool	"Rebuild files"
 		default	n
 		help
-			Clean the build directory before performing any other task. The directory
+			#-- Clean the build directory before performing any other task.
-			is cleaned only if it was populated by a previous JHALFS run.
+			#   The directory is cleaned only if it was populated by a
-			NOTE::You must be 'root' for this function to work
+			#   previous JHALFS run.
-
-	config	CONFIG_STRIP
-		bool "Strip Installed Binaries/Libraries"
-		default y
-
-
-	config	CONFIG_VIMLANG
-		bool "Install vim-lang package"
-		default y
-		help
-			#--- install the optional vim-lang package
-
-
-#------------------
-	config	CONFIG_OPTIMIZE
-		bool	"Use optimization "
-		default	n
-		help
-			# Actual optimzation flags MUST be defined in ./optimize/*
-			# files before activate this option.
 			#
-			# WARNING: The use of build optimizations may be dangerous.
+			# NOTE::You must be 'root' for this function to work
-			#   You should know what you are doing and be sure that the
-			#   optimization settings listed below are what you want.
-			#   It there are build issues or the system doesn't work as
-			#   expected, please rebuild without optimizations before
-			#   asking for support.
 
-	choice
+#--- End General Settings
-		prompt "Optimization level "
+endmenu
-		default OPT_1
-		depends	CONFIG_OPTIMIZE
-		help
-			***Optimization values are set in optimize/* files
 
-		config	OPT_1
+menu "--- Build Settings"
-			bool	"Final system only"
-		config	OPT_2
-			bool	"Both temp tools and final system"
-	endchoice
-	config	OPTIMIZE
-		int
-		default	"0"	if !CONFIG_OPTIMIZE
-		default	"1"	if OPT_1
-		default	"2"	if OPT_2
-
-#------------------
-	config	CONFIG_COMPARE
-		bool "Run comparison analysis on final stage"
-		depends	!BOOK_CLFS2
-		default n
-		help
-			#--- Should some iterative comparison analysis by made?
-			# Unless you are familiar with ICA and/or FARCE do not select this option
-			#
-			# ICA and FARCE are analysis tools for comparing one
-			#  build to the next. Builds mays differ from one iteration
-			#  to another due to the build order and these tools try
-			#  to ferret out those differences by examining the stored
-			#  build logs and binary files.
-			#
-			#  The scripts are well commented and can be found in ./extras/*
-			#
-
-	config	ITERATIONS
-		int	"Number of test runs (2,3,4,5)"
-		depends on CONFIG_COMPARE
-		range	2 5
-		default	3
-
-	config	CONFIG_ICA
-		bool	"ICA testing"
-		depends on CONFIG_COMPARE
-		default y
-		help
-			#--- Run ICA testing
-
-	config	CONFIG_FARCE
-		bool	"farce testing"
-		depends on CONFIG_COMPARE
-		default n
-		help
-			#--- Run farce testing
-#------------------
 
+	#--- Test Suites
 	config	CONFIG_TESTS
 		bool	"Run testsuites"
 		depends	!BOOK_CLFS2
 		default	n
 		help
-			#--- Run test suites
+			#-- Run test suites
 			#
 			#  You will can to select between:
 			#
@@ -470,17 +415,21 @@ depends on BOOK_HLFS
 
 		config	TST_1
 			bool	"Only final system Glibc, GCC and Binutils testsuites"
+
 		config	TST_2
 			bool	"All final system testsuites"
+
 		config	TST_3
 			bool	"Both temporary tools and final system testsuites" if !BOOK_HLFS && !BOOK_CLFS
 	endchoice
+
 	config	TEST
 		int
 		default	"0"	if !CONFIG_TESTS
 		default	"1"	if TST_1
 		default	"2"	if TST_2
 		default	"3"	if TST_3
+
 	choice
 		prompt	"Flavour ->"
 		depends	CONFIG_TESTS
@@ -488,18 +437,73 @@ depends on BOOK_HLFS
 
 		config	NO_BOMB
 			bool	"Don't stop on test suite failures"
+
 		config	BOMB
 			bool	"Abort the build at the first test suite failure"
 	endchoice
+
 	config	BOMB_TEST
 		int
 		default	"0"	if NO_BOMB
 		default	"1"	if BOMB
+	#--- End Test Suites
 
-	config	CONFIG_REPORT
+	#--- FSTAB
-		bool "Create SBU and disk usage report"
+	config	HAVE_FSTAB
+		bool	"Use a custom fstab file"
+		default	n
+		help
+			#-- Select this if you have ready a proper fstab file
+
+	config	FSTAB
+		string	"Fstab file (optional)"
+		default	"***EDIT ME***"
+		depends on HAVE_FSTAB
+		help
+			#-- The location of fstab file (if empty, a template is created)
+	#--- End FSTAB
+
+	#--- Kernel
+	config	CONFIG_BUILD_KERNEL
+		bool	"Build the kernel"
+		default	n
+		help
+			#-- Select this option if you wish to build the kernel.
+			#
+			#   You will be prompted for the full path to the .config
+			#   file. It will be copied to the 'sources' directory and
+			#   rename kernel-config
+
+	config	CONFIG
+		string	"Kernel config file"
+		default	"***EDIT ME***"
+		depends on CONFIG_BUILD_KERNEL
+		help
+			#-- Fully qualified path to a kernel config file
+			#   The config file will be copied to ${BUILD_DIR}/sources
+			#   and renamed 'kernel-config'
+
+	config	KEYMAP
+		string "Keyboard map"
+		default "none"
+		depends on !BOOK_LFS && CONFIG_BUILD_KERNEL
+		help
+			#-- Include the keymap in the kernel if defined. Path to the
+			#   keymap file relative to /usr/share/kbd/keymaps/
+			#   (e.g., i386/qwerty/us.map.gz) or "none" if you do not want
+			#   a keymap included in the kernel
+	#--- End Kernel
+
+	config	CONFIG_STRIP
+		bool "Strip Installed Binaries/Libraries"
 		default y
 
+	config	CONFIG_VIMLANG
+		bool "Install vim-lang package"
+		default y
+		help
+			#-- install the optional vim-lang package
+
 	config	TIMEZONE
 		string "TimeZone"
 		default "GMT"
@@ -507,75 +511,127 @@ depends on BOOK_HLFS
 			#-- The timezone as output by tzselect
 			#   This will be copied to /etc/localtime
 
-
 	config	LANG
 		string "Language"
 		default "$LANG"
 		help
-			#--- Language information in /etc/profile  See <locale -a> for values
+			#-- Language information in /etc/profile  See <locale -a> for values
 
 	config	LC_ALL
 		string "Language"
 		default "$LC_ALL"
 		depends on !BOOK_LFS
 		help
-			#--- Language information in /etc/profile  See <locale -a> for values
+			#-- Language information in /etc/profile  See <locale -a> for values
 
+	#--- Groff page
 	choice
 		prompt	"Groff page size"
 		default	PAGE_LETTER
 		help
-			#--- Page definition for groff: letter or A4
+			#-- Page definition for groff: letter or A4
 
 		config	PAGE_LETTER
 			bool	"letter"
+
 		config	PAGE_A4
 			bool	"A4"
 	endchoice
+
 	config	PAGE
 		string
 		default	"letter"	if PAGE_LETTER
 		default	"A4"		if PAGE_A4
+	#--- End Groff page
 
-	config	HAVE_FSTAB
+#--- End Build Settings
-		bool	"Use a cunstom fstab file"
+endmenu
+
+menu "--- Advanced Features"
+
+	config	CONFIG_REPORT
+		bool "Create SBU and disk usage report"
+		default y
+
+	#--- ICA/farce
+	config	CONFIG_COMPARE
+		bool "Run comparison analysis on final stage"
+		depends	!BOOK_CLFS2
 		default n
 		help
-			#--- The location of fstab file (if empty, a template is created)
+			#-- Should some iterative comparison analysis by made?
-	config	FSTAB
+			#
-		string	"Fstab file (optional)"
+			#   Unless you are familiar with ICA and/or FARCE do not
-		default	"***EDIT ME***"
+			#   select this option
-		depends on HAVE_FSTAB
+			#
-		help
+			#  ICA and FARCE are analysis tools for comparing one
-			#--- The location of fstab file (if empty, a template is created)
+			#  build to the next. Builds mays differ from one iteration
-
+			#  to another due to the build order and these tools try
-	config	CONFIG_BUILD_KERNEL
+			#  to ferret out those differences by examining the stored
-		bool	"Build the kernel"
+			#  build logs and binary files.
-		default	n
+			#
-		help
+			#  The scripts are well commented and can be found in ./extras/*
-			#--- Select this option if you wish to build the kernel.
 			#
-			#    You will be prompted for the full path to the .config
-			#    file. It will be copied to the 'sources' directory and
-			#    rename kernel-config
-	config	CONFIG
-		string	"Kernel config file"
-		default	"***EDIT ME***"
-		depends on CONFIG_BUILD_KERNEL
-		help
-			#--- Fully qualified path to a kernel config file
-			#    The config file will be copied to ${BUILD_DIR}/sources
-			#    and renamed 'kernel-config'
 
-	config	KEYMAP
+	config	ITERATIONS
-		string "Keyboard map"
+		int	"Number of test runs (2,3,4,5)"
-		default "none"
+		depends on CONFIG_COMPARE
-		depends on !BOOK_LFS
+		range	2 5
+		default	3
+
+	config	CONFIG_ICA
+		bool	"ICA testing"
+		depends on CONFIG_COMPARE
+		default y
 		help
-			#--- Include the keymap in the kernel if defined. Path to the
+			#-- Run ICA testing
-			#    keymap file relative to /usr/share/kbd/keymaps/
+
-			#    (e.g., i386/qwerty/us.map.gz) or "none" if you do not want
+	config	CONFIG_FARCE
-			#    a keymap included in the kernel
+		bool	"farce testing"
+		depends on CONFIG_COMPARE
+		default n
+		help
+			#-- Run farce testing
+	#--- End ICA/farce
+
+	#-- Optimizations
+	config	CONFIG_OPTIMIZE
+		bool	"Use optimization "
+		default	n
+		help
+			#-- Actual optimzation flags MUST be defined in ./optimize/*
+			#   files before activate this option.
+			#
+			# WARNING: The use of build optimizations may be dangerous.
+			#   You should know what you are doing and be sure that the
+			#   optimization settings listed below are what you want.
+			#   It there are build issues or the system doesn't work as
+			#   expected, please rebuild without optimizations before
+			#   asking for support.
+
+	choice
+		prompt "Optimization level "
+		default OPT_1
+		depends	CONFIG_OPTIMIZE
+		help
+			#-- Optimization values are set in optimize/* files
+
+		config	OPT_1
+			bool	"Final system only"
+
+		config	OPT_2
+			bool	"Both temp tools and final system"
+	endchoice
+
+	config	OPTIMIZE
+		int
+		default	"0"	if !CONFIG_OPTIMIZE
+		default	"1"	if OPT_1
+		default	"2"	if OPT_2
+	#--- End Optimizations
+
+#--- End Advanced Features
+endmenu
 
 #	config	CONFIG_BLFS_CMDS
 #		bool	"Add BLFS packages to current build"