openssl: update to 1.0.0e (patch by tripolar)

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 61a46b4..4fc0d1a 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -17,7 +17,6 @@ menu "Target Images"
        menuconfig TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"
                default y if USES_INITRAMFS
        menuconfig TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"
                default y if USES_INITRAMFS

-               depends LINUX_2_6

                help
                  Embed the rootfs into the kernel (initramfs)
 
                help
                  Embed the rootfs into the kernel (initramfs)
 


@@ -27,7 +26,6 @@ menu "Target Images"
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends TARGET_ROOTFS_INITRAMFS
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends TARGET_ROOTFS_INITRAMFS

-                       depends !LINUX_2_6_25

                        help
                          Select ramdisk compression.
 
                        help
                          Select ramdisk compression.
 


@@ -45,6 +43,10 @@ menu "Target Images"
 
                        config TARGET_INITRAMFS_COMPRESSION_LZO
                                bool "lzo"
 
                        config TARGET_INITRAMFS_COMPRESSION_LZO
                                bool "lzo"

+
+                       config TARGET_INITRAMFS_COMPRESSION_XZ
+                               bool "xz"
+                               depends LINUX_2_6_38

                endchoice
 
        comment "Root filesystem archives"
                endchoice
 
        comment "Root filesystem archives"


@@ -63,12 +65,12 @@ menu "Target Images"
 
        comment "Root filesystem images"
 
 
        comment "Root filesystem images"
 

-       config TARGET_ROOTFS_EXT2FS
-               bool "ext2"
-               default y if USES_EXT2
+       config TARGET_ROOTFS_EXT4FS
+               bool "ext4"
+               default y if USES_EXT4

                depends !TARGET_ROOTFS_INITRAMFS
                help
                depends !TARGET_ROOTFS_INITRAMFS
                help

-                 Ext2 file system with some free space for uml images
+                 Ext4 file system with some free space for uml images

 
        config TARGET_ROOTFS_ISO
                bool "iso"
 
        config TARGET_ROOTFS_ISO
                bool "iso"


@@ -104,14 +106,14 @@ menu "Target Images"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"

-               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532
+               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532

                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"
                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"

-               depends TARGET_ROOTFS_EXT2FS
+               depends TARGET_ROOTFS_EXT4FS

                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem
                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem


@@ -126,6 +128,10 @@ menu "Global build settings"
 
        comment "General build options"
 
 
        comment "General build options"
 

+       config DISPLAY_SUPPORT
+               bool "Show packages that require graphics support (local or remote)"
+               default n
+

        config BUILD_PATENTED
                default y
                bool "Compile with support for patented functionality"
        config BUILD_PATENTED
                default y
                bool "Compile with support for patented functionality"


@@ -134,12 +140,12 @@ menu "Global build settings"
                  In case software provides optional support for patented functionality,
                  this optional support will get disabled for this package.
 
                  In case software provides optional support for patented functionality,
                  this optional support will get disabled for this package.
 

-       config LARGEFILE
-               bool
-               prompt "Enable large file (files > 2 GB) support"
-               default y
+       config BUILD_NLS
+               default n
+               bool "Compile with full language support"

                help
                help

-                 Enable large file (files > 2 GB) support.
+                 When this option is enabled, packages are built with the full versions of iconv and GNU gettext
+                 instead of the default OpenWrt stubs.

 
        config SHADOW_PASSWORDS
                bool
 
        config SHADOW_PASSWORDS
                bool


@@ -157,7 +163,7 @@ menu "Global build settings"
 
        config COLLECT_KERNEL_DEBUG
                bool
 
        config COLLECT_KERNEL_DEBUG
                bool

-               prompt "Colllect kernel debug information"
+               prompt "Collect kernel debug information"

                select KERNEL_DEBUG_INFO
                default n
                help
                select KERNEL_DEBUG_INFO
                default n
                help


@@ -169,7 +175,6 @@ menu "Global build settings"
        config KERNEL_DEBUG_FS
                bool "Compile the kernel with Debug FileSystem enabled"
                default y
        config KERNEL_DEBUG_FS
                bool "Compile the kernel with Debug FileSystem enabled"
                default y

-               depends LINUX_2_6

                help
                  debugfs is a virtual file system that kernel developers use to put
                  debugging files into. Enable this option to be able to read and
                help
                  debugfs is a virtual file system that kernel developers use to put
                  debugging files into. Enable this option to be able to read and


@@ -199,6 +204,33 @@ menu "Global build settings"
                help
                  This will compile your kernel and modules with debug information.
 
                help
                  This will compile your kernel and modules with debug information.
 

+       config KERNEL_DEBUG_LL
+               bool
+               default n
+               depends on arm
+               help
+                 ARM low level debugging
+
+       config KERNEL_EARLY_PRINTK
+               bool "Compile the kernel with early printk"
+               default n
+               depends on arm
+               select KERNEL_DEBUG_KERNEL
+               select KERNEL_DEBUG_LL if arm
+               help
+                 Compile the kernel with early printk support.
+                 This is only useful for debugging purposes to send messages
+                 over the serial console in early boot.
+                 Enable this to debug early boot problems.
+
+       config KERNEL_AIO
+               bool "Compile the kernel with asynchronous IO support"
+               default n
+
+       config KERNEL_MAGIC_SYSRQ
+               bool "Compile the kernel with SysRq support"
+               default n
+

        comment "Package build options"
 
        config DEBUG
        comment "Package build options"
 
        config DEBUG


@@ -215,6 +247,66 @@ menu "Global build settings"
                help
                  Enable IPV6 support in packages (passes --enable-ipv6 to configure scripts).
 
                help
                  Enable IPV6 support in packages (passes --enable-ipv6 to configure scripts).
 

+       config PKG_BUILD_PARALLEL
+               bool
+               prompt "Compile certain packages parallelized"
+               default n
+               help
+                 This adds a -jX option to certain packages that are known to
+                 behave well for parallel build.
+
+                 Note that this may overcommit CPU resources depending on the
+                 -j level of the main make process, the number of package
+                 submake jobs selected below and the number of actual CPUs present.
+                 Example: If the main make is passed a -j4 and the submake -j
+                 is also set to 4, we may end up with 16 parallel make processes
+                 in the worst case.
+
+                 You get maximum build performance, if you set the package build
+                 jobs to the number of CPUs (cores) available and also start the main
+                 make process with -jX, where X is the number of CPUs (cores).
+                 However, make sure you have enough RAM available for
+                 NR_CPUS to the power of two (NR_CPUS^2) make jobs.
+
+                 If you are unsure, select N.
+
+       config PKG_BUILD_JOBS
+               int
+               prompt "Number of package submake jobs (2-512)"
+               range 2 512
+               default 2
+               depends on PKG_BUILD_PARALLEL
+               help
+                 The number of jobs (-jX) to pass to packages submake.
+
+       config PKG_DEFAULT_PARALLEL
+               bool
+               prompt "Parallelize the default package build rule (May break build)"
+               depends on PKG_BUILD_PARALLEL
+               default n
+               help
+                 Always set the default package build rules to parallel build.
+
+                 WARNING: This may break build or kill your cat, as it builds
+                 packages with multiple jobs that are probably not tested in
+                 a parallel build environment.
+
+                 Only say Y, if you don't mind fixing broken packages.
+                 Before reporting build bugs, set this to N and re-run the build.
+
+       config TOOLCHAIN_PARALLEL
+               bool
+               prompt "Parallelize the toolchain build (May break build)"
+               depends on PKG_BUILD_PARALLEL
+               default n
+               help
+                 Build the toolchain with parallel make jobs.
+                 This speeds up the toolchain build on SMP machines, but may
+                 break the build for certain toolchain versions.
+
+                 If you say Y, toolchain build might break.
+                 Before reporting build bugs, set this to N and re-run the build.
+

        comment "Stripping options"
 
        choice
        comment "Stripping options"
 
        choice


@@ -255,7 +347,6 @@ menu "Global build settings"
                  Specifies arguments passed to the strip command when stripping binaries
 
        config STRIP_KERNEL_EXPORTS
                  Specifies arguments passed to the strip command when stripping binaries
 
        config STRIP_KERNEL_EXPORTS

-               depends LINUX_2_6

                bool "Strip unnecessary exports from the kernel image"
                help
                  Reduces kernel size by stripping unused kernel exports from the kernel image
                bool "Strip unnecessary exports from the kernel image"
                help
                  Reduces kernel size by stripping unused kernel exports from the kernel image


@@ -334,6 +425,19 @@ menuconfig DEVEL
                  In this instance, the --refererence option of git clone will
                  be used thus creating a quick local clone of your repo.
 
                  In this instance, the --refererence option of git clone will
                  be used thus creating a quick local clone of your repo.
 

+       config BUILD_LOG
+               bool "Enable log files during build process" if DEVEL
+               help
+                 If enabled log files will be written to the ./log directory
+
+       config SRC_TREE_OVERRIDE
+               bool "Enable package source tree override" if DEVEL
+               help
+                 If enabled, you can force a package to use a git tree as source
+                 code instead of the normal tarball. Create a symlink 'git-src'
+                 in the package directory, pointing to the .git tree that you want
+                 to pull the source code from
+

 menuconfig TARGET_OPTIONS
        bool "Target Options"  if DEVEL
 
 menuconfig TARGET_OPTIONS
        bool "Target Options"  if DEVEL