X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=Config.in;h=2e86d02cf55ce01f43efeac05fff2289e149b7fa;hp=fde72b518ecd7df83444d7a626314fccc4fa3cfb;hb=fc54b9bf158eea9cae647ce2c58f7d9989af173a;hpb=39093d7cdd662d17f5177c804c944f82d8639113

diff --git a/Config.in b/Config.in
index fde72b518e..2e86d02cf5 100644
--- a/Config.in
+++ b/Config.in
@@ -12,63 +12,6 @@ config HAVE_DOT_CONFIG
 
 source "target/Config.in"
 
-config ALL
-	bool "Select all packages by default"
-	default n
-
-menuconfig DEVEL
-	bool "Advanced configuration options (for developers)"
-	default n
-	select BUILDOPTS
-	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
-
-config BROKEN
-	bool "Show broken platforms / packages" if DEVEL
-	default n
-
-config LOCALMIRROR
-	string "Local mirror for source packages" if DEVEL
-
-menuconfig BUILDOPTS
-	bool "Build Options" if DEVEL
-
-config AUTOREBUILD
-	bool
-	prompt "Automatic rebuild of packages" if BUILDOPTS
-	default y
-	help
-		Automatically rebuild packages when their files change
-
-config TAR_VERBOSITY
-	bool 
-	prompt "Tar verbose" if BUILDOPTS
-	default n
-
-config JLEVEL
-	int
-	prompt "Number of jobs to run simultaneously" if BUILDOPTS
-	default "1"
-	help
-	    Number of jobs to run simultanesouly
-
-config CCACHE
-	bool
-	prompt "Use ccache" if BUILDOPTS
-	default n
-	help
-		Compiler cache; see http://ccache.samba.org/
-
-config SOURCE_FEEDS
-	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 : " "
-
-source "toolchain/Config.in"
-source "target/imagebuilder/Config.in"
-source "target/sdk/Config.in"
-
 menu "Target Images"
 	config TARGET_ROOTFS_INITRAMFS
 		bool "ramdisk"
@@ -93,38 +36,154 @@ menu "Target Images"
 
 	config TARGET_ROOTFS_TGZ
 		bool "tgz"
-		default y if !USES_SQUASHFS && !USES_JFFS2
+		default y if USES_TGZ
 		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a compressed tar archive of the the root filesystem
 		  
+	config TARGET_ROOTFS_CPIOGZ
+		bool "cpiogz"
+		default y if USES_CPIOGZ
+		depends !TARGET_ROOTFS_INITRAMFS
+		help
+		  Build a compressed cpio archive of the the root filesystem
+		  
 	config TARGET_ROOTFS_EXT2FS
 		bool "ext2"
-		default y if !USES_SQUASHFS && !USES_JFFS2
 		default y if USES_EXT2
 		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Ext2 file system with some free space for uml images
 
+	config TARGET_ROOTFS_ISO 
+		bool "iso" 
+		default n 
+		depends TARGET_ROOTFS_INITRAMFS && TARGET_x86 
+		help 
+		  Create some bootable ISO image 
+
 comment "Image Options"
 
 source "target/linux/*/image/Config.in"
 
     config TARGET_ROOTFS_FSPART
         int "Filesystem part size (in MB)"
-        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || LINUX_2_6_RB532
-        default 16
+        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532 || TARGET_olpc
+        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
 
+
+config ALL
+	bool "Select all packages by default"
+	default n
+
+menuconfig DEVEL
+	bool "Advanced configuration options (for developers)"
+	default n
+	select BUILDOPTS
+	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
+
+config BROKEN
+	bool
+	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 DEBUG
+	bool
+	prompt "Enable debugging" if BUILDOPTS
+	select NO_STRIP
+	default n
+	help
+		Disables stripping and adds -g3 to the CFLAGS
+
+config NO_STRIP
+	bool "Do not strip generated binaries (enable for native compiling)" if BUILDOPTS
+	default n
+
+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
+	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
+	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 CCACHE
+	bool
+	prompt "Use ccache" if BUILDOPTS
+	default n
+	help
+		Compiler cache; see http://ccache.samba.org/
+
+config EXTERNAL_KERNEL_TREE
+	string
+	prompt "Use external kernel tree" if BUILDOPTS
+	default ""
+
+config KERNEL_GIT_CLONE_URI
+	string
+	prompt "Enter git repository to clone" if BUILDOPTS
+	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 KERNEL_GIT_LOCAL_REPOSITORY
+	string
+	prompt "Enter path to local reference repository" if BUILDOPTS
+	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"
+
+source "target/imagebuilder/Config.in"
+source "target/sdk/Config.in"
+
 source "tmp/.config-package.in"
 
+