X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Config.in;h=4d75896d8dd931d9fc679fc5afa8178651310fec;hp=6f2cdcc2d0b38c440b94011668e68c733a7c7448;hb=7d60ab911bd0e49c03e2060282404a0fa66a30ec;hpb=f0b7f635c89e8c57e6bf3b9accad760b13832ca5

diff --git a/Config.in b/Config.in
index 6f2cdcc2d0..4d75896d8d 100644
--- a/Config.in
+++ b/Config.in
@@ -15,7 +15,7 @@ source "target/Config.in"
 menu "Target Images"
 	config TARGET_ROOTFS_INITRAMFS
 		bool "ramdisk"
-		default n
+		default y if USES_INITRAMFS
 		depends LINUX_2_6
 		help
 		  Embed the rootfs into the kernel (initramfs)
@@ -43,7 +43,7 @@ menu "Target Images"
 		  
 	config TARGET_ROOTFS_CPIOGZ
 		bool "cpiogz"
-		default y if USES_TGZ
+		default y if USES_CPIOGZ
 		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a compressed cpio archive of the the root filesystem
@@ -69,28 +69,73 @@ source "target/linux/*/image/Config.in"
     config TARGET_ROOTFS_FSPART
         int "Filesystem part size (in MB)"
         depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532 || TARGET_olpc
-        default 16
+        default 48
         help
             Allows you to change the filesystem partition size
 
     config TARGET_ROOTFS_MAXINODE
         int "Maximum number of inodes in filesystem"
         depends TARGET_ROOTFS_EXT2FS
-        default 1500
+        default 6000
         help
             Allows you to change the maximum number of inodes in the filesystem
 
 endmenu
 
+menu "Global build settings"
 
 config ALL
 	bool "Select all packages by default"
 	default n
 
+comment "Features"
+
+config CLEAN_IPKG
+	bool
+	prompt "Disable ipkg/opkg installation on the target"
+	default n
+	help
+		This removes all ipkg data from the target directory before building the root fs
+
+comment "Package build options"
+
+config DEBUG
+	bool
+	prompt "Compile packages with debugging info"
+	default n
+	help
+		Disables stripping and adds -g3 to the CFLAGS
+
+config DEBUG_DIR
+	bool "Install debugging binaries into a staging directory"
+	default n
+	help
+		This will install all compiled package binaries into build_dir/target-*/debug-*/,
+		useful for cross-debugging via gdb/gdbserver
+
+config NO_STRIP
+	bool "Install unstripped binary on the target (useful for native compiling/debugging)"
+	default n
+
+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.
+
+endmenu
+
 menuconfig DEVEL
 	bool "Advanced configuration options (for developers)"
 	default n
-	select BUILDOPTS
 	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
@@ -98,72 +143,70 @@ config BROKEN
 	prompt "Show broken platforms / packages" if DEVEL
 	default n
 
+config DOWNLOAD_FOLDER
+	string
+	prompt "Download folder" if DEVEL
+	default ""
+
 config LOCALMIRROR
 	string
 	prompt "Local mirror for source packages" if DEVEL
 
-menuconfig BUILDOPTS
-	bool
-	prompt "Build Options" if DEVEL
-
-config CLEAN_IPKG
-	bool
-	prompt "Clean all ipkg files before building the rootfs" if BUILDOPTS
-	default n
-
 config AUTOREBUILD
 	bool
-	prompt "Automatic rebuild of packages" if BUILDOPTS
+	prompt "Automatic rebuild of packages" if DEVEL
 	default y
 	help
 		Automatically rebuild packages when their files change
 
 config BUILD_SUFFIX
 	string
-	prompt "Build suffix to append to the BUILD_DIR variable" if BUILDOPTS
+	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 TAR_VERBOSITY
-	bool 
-	prompt "Tar verbose" if BUILDOPTS
-	default n
+config TARGET_ROOTFS_DIR
+	string
+	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
 	bool
-	prompt "Use ccache" if BUILDOPTS
+	prompt "Use ccache" if DEVEL
 	default n
 	help
 		Compiler cache; see http://ccache.samba.org/
 
-config SOURCE_FEEDS
+config EXTERNAL_KERNEL_TREE
 	string
-	prompt "Enter here external source feeds you want to include" if BUILDOPTS
-	default "https://svn.openwrt.org/openwrt/packages/"
-	help
-		Separate sources with spaces : " "
+	prompt "Use external kernel tree" if DEVEL
+	default ""
 
-config SOURCE_FEEDS_REV
+config KERNEL_GIT_CLONE_URI
 	string
-	prompt "Revision for the source feed svn checkout" if BUILDOPTS
+	prompt "Enter git repository to clone" if DEVEL
 	default ""
+	help
+		Enter the full git repository path i.e.:
+		git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+		This will create a git clone of the kernel in your build
+		directory.
 
-config EXTERNAL_KERNEL_TREE
+config KERNEL_GIT_LOCAL_REPOSITORY
 	string
-	prompt "Use external kernel tree" 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.
 
 source "toolchain/Config.in"
-menuconfig BUILDSYSTEM_SETTINGS
-    bool "Buildsystem settings" 
 
-config DOWNLOAD_FOLDER
-	string
-	prompt "Download folder"
-	default ""
-	depends BUILDSYSTEM_SETTINGS 
 source "target/imagebuilder/Config.in"
 source "target/sdk/Config.in"