fixup the hunks in patch

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 95b9a4b..30d7eca 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 OpenWrt.org
+# Copyright (C) 2006-2009 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.


@@ -15,11 +15,36 @@ source "target/Config.in"
 menu "Target Images"
        config TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"
 menu "Target Images"
        config TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"

-               default n
+               default y if USES_INITRAMFS

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

+       choice
+               prompt "ramdisk compression"
+               depends TARGET_ROOTFS_INITRAMFS
+               depends !LINUX_2_6_25
+               default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
+               default TARGET_INITRAMFS_COMPRESSION_NONE
+               help
+                 Select ramdisk compression.
+
+               config TARGET_INITRAMFS_COMPRESSION_NONE
+                       bool "NONE"
+
+               config TARGET_INITRAMFS_COMPRESSION_GZIP
+                       bool "GZIP"
+
+               config TARGET_INITRAMFS_COMPRESSION_BZIP2
+                       bool "BZIP2"
+
+               config TARGET_INITRAMFS_COMPRESSION_LZMA
+                       bool "LZMA"
+
+               config TARGET_INITRAMFS_COMPRESSION_LZO
+                       bool "LZO"
+       endchoice
+

        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y if USES_JFFS2
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y if USES_JFFS2


@@ -40,14 +65,14 @@ menu "Target Images"
                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Build a compressed tar archive of the the root filesystem
                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_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_EXT2
        config TARGET_ROOTFS_EXT2FS
                bool "ext2"
                default y if USES_EXT2


@@ -55,12 +80,19 @@ menu "Target Images"
                help
                  Ext2 file system with some free space for uml images
 
                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 
+       config TARGET_ROOTFS_ISO
+               bool "iso"
+               default n
+               depends TARGET_ROOTFS_INITRAMFS && TARGET_x86
+               help
+                 Create some bootable ISO image
+
+       config TARGET_ROOTFS_UBIFS
+               bool "ubifs"
+               default y if USES_UBIFS
+               depends !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+               help
+                 Build a ubifs root filesystem

 
 comment "Image Options"
 
 
 comment "Image Options"
 


@@ -82,87 +114,239 @@ source "target/linux/*/image/Config.in"
 
 endmenu
 
 
 endmenu
 

+menu "Global build settings"

 
 config ALL
        bool "Select all packages by default"
        default n
 
 
 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
+comment "General build options"

 
 

-config BROKEN
+config CLEAN_IPKG

        bool
        bool

-       prompt "Show broken platforms / packages" if DEVEL
+       prompt "Disable ipkg/opkg installation on the target"

        default n
        default n

+       help
+               This removes all ipkg data from the target directory before building the root fs

 
 

-config DOWNLOAD_FOLDER
-       string
-       prompt "Download folder" if DEVEL
-       default ""
+config LARGEFILE
+       bool
+       prompt "Enable large file (files > 2 GB) support"
+       default y
+       help
+         Enable large file (files > 2 GB) support.

 
 

-config LOCALMIRROR
+config SHADOW_PASSWORDS
+       bool
+       prompt "Enable shadow password support"
+       default y
+       help
+         Enable shadow password support.
+
+choice
+       prompt "Binary stripping method"
+       default USE_STRIP   if EXTERNAL_TOOLCHAIN
+       default USE_STRIP   if USE_GLIBC || USE_EGLIBC
+       default USE_SSTRIP
+       help
+         Select the binary stripping method you wish to use.
+
+       config NO_STRIP
+               bool "none"
+               help
+                 This will install unstripped binaries (useful for native compiling/debugging)
+
+       config USE_STRIP
+               bool "strip"
+               help
+                 This will install binaries stripped using strip from binutils
+
+
+       config USE_SSTRIP
+               bool "sstrip"
+               depends !DEBUG
+               depends !USE_GLIBC
+               depends !USE_EGLIBC
+               help
+                 This will install binaries stripped using sstrip
+
+endchoice
+
+config STRIP_ARGS

        string
        string

-       prompt "Local mirror for source packages" if DEVEL
+       prompt "Strip arguments"
+       depends USE_STRIP
+       default "--strip-unneeded --remove-section=.comment --remove-section=.note" if DEBUG
+       default "--strip-all"
+       help
+         Specifies arguments passed to the strip command when stripping binaries

 
 

-menuconfig BUILDOPTS
-       bool
-       prompt "Build Options" if DEVEL
+config USE_MKLIBS
+       bool "Strip unnecessary functions from libraries"
+       help
+         Reduces libraries to only those functions that are necessary for using all
+         selected packages (including those selected as <M>)
+         Note that this will make the system libraries incompatible with most of the packages
+         that are not selected during the build process
+
+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
+         Note that this might make the kernel incompatible with any kernel modules that
+         were not selected at the time the kernel image was created
+
+comment "Package build options"

 
 config DEBUG
        bool
 
 config DEBUG
        bool

-       prompt "Enable debugging" if BUILDOPTS
-       select NO_STRIP
+       prompt "Compile packages with debugging info"

        default n
        help
        default n
        help

-               Disables stripping and adds -g3 to the CFLAGS
+               Adds -g3 to the CFLAGS

 
 

-config NO_STRIP
-       bool "Do not strip generated binaries (enable for native compiling)" if BUILDOPTS
+config DEBUG_DIR
+       bool "Install debugging binaries into a staging directory"

        default n
        default n

+       help
+               This will install all compiled package binaries into build_dir/target-*/debug-*/,
+               useful for cross-debugging via gdb/gdbserver

 
 

-config CLEAN_IPKG
+config IPV6
+        bool
+        prompt "Enable IPv6 support in packages"
+        default n
+        help
+                Enable IPV6 support in packages (passes --enable-ipv6 to configure scripts).
+
+comment "Kernel build options"
+
+config KERNEL_KALLSYMS
+       bool "Compile the kernel with symbol table information"
+       default n
+       help
+               This will give you more information in stack traces from kernel oopses
+
+config KERNEL_PROFILING
+       bool "Compile the kernel with profiling enabled"
+       default n
+       help
+               Enable the extended profiling support mechanisms used by profilers such
+               as OProfile.
+
+config KERNEL_DEBUG_FS
+       bool "Compile the kernel with Debug Filesystem enabled"
+       depends LINUX_2_6
+       default y
+       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
+               write to these files.
+
+endmenu
+
+menuconfig DEVEL
+       bool "Advanced configuration options (for developers)"
+       default n
+
+config BROKEN

        bool
        bool

-       prompt "Clean all ipkg files before building the rootfs" if BUILDOPTS
+       prompt "Show broken platforms / packages" if DEVEL

        default n
 
        default n
 

+config DOWNLOAD_FOLDER
+       string
+       prompt "Download folder" if DEVEL
+       default ""
+
+config LOCALMIRROR
+       string
+       prompt "Local mirror for source packages" if DEVEL
+

 config AUTOREBUILD
        bool
 config AUTOREBUILD
        bool

-       prompt "Automatic rebuild of packages" if BUILDOPTS
+       prompt "Automatic rebuild of packages" if DEVEL

        default y
        help
                Automatically rebuild packages when their files change
 
 config BUILD_SUFFIX
        string
        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
+       prompt "Build suffix to append to the BUILD_DIR variable" if DEVEL

        default ""
        help
                Build suffix to append to the BUILD_DIR variable, i.e: build_dir_suffix
 
        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 TARGET_ROOTFS_DIR
+       string
+       prompt "Override the default TARGET_ROOTFS_DIR variable" if DEVEL
+       default ""
+       help
+               Override the default TARGET_ROOTFS_DIR variable content $(BUILD_DIR) with custom path.
+               Use this option to re-define the location of the target root file system directory.

 
 config CCACHE
        bool
 
 config CCACHE
        bool

-       prompt "Use ccache" if BUILDOPTS
+       prompt "Use ccache" if DEVEL

        default n
        help
                Compiler cache; see http://ccache.samba.org/
 
 config EXTERNAL_KERNEL_TREE
        string
        default n
        help
                Compiler cache; see http://ccache.samba.org/
 
 config EXTERNAL_KERNEL_TREE
        string

-       prompt "Use external kernel tree" if BUILDOPTS
+       prompt "Use external kernel tree" if DEVEL
+       default ""
+
+config KERNEL_GIT_CLONE_URI
+       string
+       prompt "Enter git repository to clone" if DEVEL
+       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 DEVEL

        default ""
        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.
+
+
+menuconfig TARGET_OPTIONS
+       bool "Target Options"  if DEVEL
+
+config TARGET_OPTIMIZATION
+       string
+       prompt "Target Optimizations" if TARGET_OPTIONS
+       default DEFAULT_TARGET_OPTIMIZATION
+       help
+         Optimizations to use when building for the target host.
+
+config SOFT_FLOAT
+       bool
+       prompt "Use software floating point by default" if TARGET_OPTIONS
+       default y
+       depends on (arm || armeb || powerpc || mipsel || mips) && !HAS_FPU
+       help
+         If your target CPU does not have a Floating Point Unit (FPU) or a
+         kernel FPU emulator, but you still wish to support floating point
+         functions, then everything will need to be compiled with soft floating
+         point support (-msoft-float).
+
+         Most people will answer N.
+

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

+source "target/toolchain/Config.in"

 
 source "tmp/.config-package.in"
 
 
 source "tmp/.config-package.in"