apex: Revert back to 1.4.7 - what I thought I tested wasn't what I actually tested...

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 308df37..0bced5c 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,92 +1,131 @@
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.

 #
 
 #
 

-mainmenu "OpenWRT Configuration"
-
-config MODULES
-       bool
-       default y
-
-config BR2_HAVE_DOT_CONFIG
-       bool
-       default y
+mainmenu "OpenWrt Configuration"

 
 

-config BR2_mipsel
+config HAVE_DOT_CONFIG

        bool
        default y
 
        bool
        default y
 

-choice
-       prompt "Target Architecture" if CONFIG_DEVEL
-
-config BR2_arm
-       bool "arm"
-
-config BR2_armeb
-       bool "armeb"
-
-config BR2_cris
-       bool "cris"
-
-config BR2_i386
-       bool "i386"
-
-config BR2_m68k
-       bool "m68k"
-
-config BR2_mips
-       bool "mips"
-
-config BR2_mipsel
-       bool "mipsel"
-
-config BR2_powerpc
-       bool "powerpc"
+source "target/Config.in"

 
 

-config BR2_sh3
-       bool "sh3"
+menu "Target Images"
+       config TARGET_ROOTFS_INITRAMFS
+               bool "ramdisk"
+               default n
+               depends LINUX_2_6
+               help
+                 Embed the rootfs into the kernel (initramfs)
+
+       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_TGZ
+               bool "tgz"
+               default y if !USES_SQUASHFS && !USES_JFFS2
+               depends !TARGET_ROOTFS_INITRAMFS
+               help
+                 Build a compressed tar 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
+
+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
+        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
+        help
+            Allows you to change the maximum number of inodes in the filesystem
+
+endmenu
+
+
+config ALL
+       bool "Select all packages by default"
+       default n

 
 

-config BR2_sh3eb
-       bool "sh3eb"
+menuconfig DEVEL
+       bool "Advanced configuration options (for developers)"
+       default n
+       select BUILDOPTS
+       select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN

 
 

-config BR2_sh4
-       bool "sh4"
+config BROKEN
+       bool "Show broken platforms / packages" if DEVEL
+       default n

 
 

-config BR2_sh4eb
-       bool "sh4eb"
+config LOCALMIRROR
+       string "Local mirror for source packages" if DEVEL

 
 

-config BR2_sparc
-       bool "sparc"
+menuconfig BUILDOPTS
+       bool "Build Options" if DEVEL

 
 

-endchoice
+config AUTOREBUILD
+       bool
+       prompt "Automatic rebuild of packages" if BUILDOPTS
+       default y
+       help
+               Automatically rebuild packages when their files change

 
 

-config BR2_ARCH
-       string
-       default "arm"     if BR2_arm
-       default "armeb"   if BR2_armeb
-       default "cris"    if BR2_cris
-       default "i386"    if BR2_i386
-       default "m68k"    if BR2_m68k
-       default "mips"    if BR2_mips
-       default "mipsel"  if BR2_mipsel || !CONFIG_DEVEL
-       default "powerpc" if BR2_powerpc
-       default "sh3"     if BR2_sh3
-       default "sh3eb"   if BR2_sh3eb
-       default "sh4"     if BR2_sh4
-       default "sh4eb"   if BR2_sh4eb
-       default "sparc"   if BR2_sparc
-
-
-config BR2_WGET
-       string 
-       default "wget --passive-ftp -nd"
-
-config BR2_TAR_VERBOSITY
+config TAR_VERBOSITY

        bool 
        bool 

+       prompt "Tar verbose" if BUILDOPTS

        default n
 
        default n
 

-config BR2_JLEVEL
+config JLEVEL

        int
        int

+       prompt "Number of jobs to run simultaneously" if BUILDOPTS

        default "1"
        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 "toolchain/Config.in"

-source "package/Config.in"
-source "target/Config.in"
+source "target/imagebuilder/Config.in"
+source "target/sdk/Config.in"
+
+source "tmp/.config-package.in"
+