[generic] revert unrelated change in previous commit

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 5763be0..4e874a6 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -26,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.
 


@@ -44,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"


@@ -137,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. If uClibc is used, it is also built with locale support.

 
        config SHADOW_PASSWORDS
                bool
 
        config SHADOW_PASSWORDS
                bool


@@ -220,6 +223,27 @@ menu "Global build settings"
                  over the serial console in early boot.
                  Enable this to debug early boot problems.
 
                  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 y
+
+       config KERNEL_ELF_CORE
+               bool "Enable process core dump support"
+               default y
+
+       config KERNEL_PROVE_LOCKING
+               bool "Enable kernel lock checking"
+               select KERNEL_DEBUG_KERNEL
+               default n
+
+       config KERNEL_PRINTK_TIME
+               bool "Enable printk timestamps"
+               default y
+

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


@@ -414,6 +438,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