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 74b3696..0bced5c 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,3 +1,7 @@
+# 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"
 #
 
 mainmenu "OpenWrt Configuration"


@@ -8,6 +12,64 @@ config HAVE_DOT_CONFIG
 
 source "target/Config.in"
 
 
 source "target/Config.in"
 

+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 ALL
        bool "Select all packages by default"
        default n


@@ -22,6 +84,9 @@ config BROKEN
        bool "Show broken platforms / packages" if DEVEL
        default n
 
        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
 
 menuconfig BUILDOPTS
        bool "Build Options" if DEVEL
 


@@ -51,51 +116,16 @@ config CCACHE
        help
                Compiler cache; see http://ccache.samba.org/
 
        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 "target/imagebuilder/Config.in"

 source "target/sdk/Config.in"
 
 source "target/sdk/Config.in"
 

-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
-               depends !TARGET_ROOTFS_INITRAMFS
-               help
-                 Ext2 file system with some free space for uml images
-
-comment "Image Options"
-
-source "target/image/*/Config.in"
-
-endmenu
-
-source "target/linux/Config.in"
-source ".config.in"
+source "tmp/.config-package.in"