update vsftpd to latest upstream release (v2.0.4) and fix patches

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index aa14eda..15130b1 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,6 +1,10 @@
 #
 
 #
 

-mainmenu "Buildroot2 Configuration"
+mainmenu "OpenWrt Configuration"
+
+config MODULES
+       bool
+       default y

 
 config BR2_HAVE_DOT_CONFIG
        bool
 
 config BR2_HAVE_DOT_CONFIG
        bool


@@ -9,8 +13,22 @@ config BR2_HAVE_DOT_CONFIG
 choice
        prompt "Target Architecture"
        default BR2_mipsel
 choice
        prompt "Target Architecture"
        default BR2_mipsel

-       help
-         Stuff
+
+# Supported architectures
+
+config BR2_i386
+       bool "i386"
+       
+config BR2_mips
+       bool "mips"
+
+config BR2_mipsel
+       bool "mipsel"
+
+
+if CONFIG_DEVEL
+
+# Unsupported architectures

 
 config BR2_arm
        bool "arm"
 
 config BR2_arm
        bool "arm"


@@ -21,18 +39,9 @@ config BR2_armeb
 config BR2_cris
        bool "cris"
 
 config BR2_cris
        bool "cris"
 

-config BR2_i386
-       bool "i386"
-

 config BR2_m68k
        bool "m68k"
 
 config BR2_m68k
        bool "m68k"
 

-config BR2_mips
-       bool "mips"
-
-config BR2_mipsel
-       bool "mipsel"
-

 config BR2_powerpc
        bool "powerpc"
 
 config BR2_powerpc
        bool "powerpc"
 


@@ -51,6 +60,7 @@ config BR2_sh4eb
 config BR2_sparc
        bool "sparc"
 
 config BR2_sparc
        bool "sparc"
 

+endif

 endchoice
 
 config BR2_ARCH
 endchoice
 
 config BR2_ARCH


@@ -61,7 +71,7 @@ config BR2_ARCH
        default "i386"    if BR2_i386
        default "m68k"    if BR2_m68k
        default "mips"    if BR2_mips
        default "i386"    if BR2_i386
        default "m68k"    if BR2_m68k
        default "mips"    if BR2_mips

-       default "mipsel"  if BR2_mipsel
+       default "mipsel"  if BR2_mipsel || !CONFIG_DEVEL

        default "powerpc" if BR2_powerpc
        default "sh3"     if BR2_sh3
        default "sh3eb"   if BR2_sh3eb
        default "powerpc" if BR2_powerpc
        default "sh3"     if BR2_sh3
        default "sh3eb"   if BR2_sh3eb


@@ -70,40 +80,19 @@ config BR2_ARCH
        default "sparc"   if BR2_sparc
 
 
        default "sparc"   if BR2_sparc
 
 

-menu "Build options"
-

 config BR2_WGET
 config BR2_WGET

-       string "Wget command"
+       string 

        default "wget --passive-ftp -nd"
 
 config BR2_TAR_VERBOSITY
        default "wget --passive-ftp -nd"
 
 config BR2_TAR_VERBOSITY

-       bool "Tar verbose"
+       bool 

        default n
 
        default n
 

-config BR2_STAGING_DIR
-       string "Toolchain and header file location?"
-       default "$(BUILD_DIR)/staging_dir"
-       help
-           This is the location where the toolchain will be installed.
-           Since the toolchain will not work if it is moved from this
-           location, it is important for people wishing to package up
-           a uClibc toolchain that this be set to the location in which
-           the toolchain will be used.
-
-           Most people will leave this set to the default value of
-           "$(BUILD_DIR)/staging_dir".
-

 config BR2_JLEVEL
 config BR2_JLEVEL

-       int "Number of jobs to run simultaneously"
+       int

        default "1"
        default "1"

-       help
-           Number of jobs to run simultanesouly
-
-endmenu

 
 

+source "target/Config.in"

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

-

 source "package/Config.in"
 source "package/Config.in"

-
-source "target/Config.in"
-
+source "target/linux/Config.in"