Put back kmod-ebtables for 2.4 kernels

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 0bced5c..c8b739c 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -36,19 +36,25 @@ menu "Target Images"
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"

-               default y if !USES_SQUASHFS && !USES_JFFS2
+               default y if USES_TGZ

                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Build a compressed tar archive of the the root filesystem
                  
        config TARGET_ROOTFS_EXT2FS
                bool "ext2"
                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
 
                default y if USES_EXT2
                depends !TARGET_ROOTFS_INITRAMFS
                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 
+

 comment "Image Options"
 
 source "target/linux/*/image/Config.in"
 comment "Image Options"
 
 source "target/linux/*/image/Config.in"


@@ -81,14 +87,22 @@ menuconfig DEVEL
        select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
        select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN

-       bool "Show broken platforms / packages" if DEVEL
+       bool
+       prompt "Show broken platforms / packages" if DEVEL

        default n
 
 config LOCALMIRROR
        default n
 
 config LOCALMIRROR

-       string "Local mirror for source packages" if DEVEL
+       string
+       prompt "Local mirror for source packages" if DEVEL

 
 menuconfig BUILDOPTS
 
 menuconfig BUILDOPTS

-       bool "Build Options" if DEVEL
+       bool
+       prompt "Build Options" if DEVEL
+
+config CLEAN_IPKG
+       bool
+       prompt "Clean all ipkg files before building the rootfs" if BUILDOPTS
+       default n

 
 config AUTOREBUILD
        bool
 
 config AUTOREBUILD
        bool


@@ -97,18 +111,18 @@ config AUTOREBUILD
        help
                Automatically rebuild packages when their files change
 
        help
                Automatically rebuild packages when their files change
 

+config BUILD_SUFFIX
+       string
+       prompt "Build suffix to append to the BUILD_DIR variable" if BUILDOPTS
+       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 TAR_VERBOSITY
        bool 
        prompt "Tar verbose" if BUILDOPTS
        default n
 

-config JLEVEL
-       int
-       prompt "Number of jobs to run simultaneously" if BUILDOPTS
-       default "1"
-       help
-           Number of jobs to run simultanesouly
-

 config CCACHE
        bool
        prompt "Use ccache" if BUILDOPTS
 config CCACHE
        bool
        prompt "Use ccache" if BUILDOPTS


@@ -123,9 +137,29 @@ config SOURCE_FEEDS
        help
                Separate sources with spaces : " "
 
        help
                Separate sources with spaces : " "
 

+config SOURCE_FEEDS_REV
+       string
+       prompt "Revision for the source feed svn checkout" if BUILDOPTS
+       default ""
+
+config EXTERNAL_KERNEL_TREE
+       string
+       prompt "Use external kernel tree" if DEVEL
+       default ""
+
+

 source "toolchain/Config.in"
 source "toolchain/Config.in"

+menuconfig BUILDSYSTEM_SETTINGS
+    bool "Buildsystem settings" 
+
+config DOWNLOAD_FOLDER
+       string
+       prompt "Download folder"
+       default ""
+       depends BUILDSYSTEM_SETTINGS 

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

+