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

[openwrt.git] / openwrt / Config.in

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

-mainmenu "OpenWRT Configuration"
+mainmenu "OpenWrt Configuration"

 
 config MODULES
        bool
 
 config MODULES
        bool


@@ -11,9 +11,24 @@ config BR2_HAVE_DOT_CONFIG
        default y
 
 choice
        default y
 
 choice

+       prompt "Target Architecture"

        default BR2_mipsel
        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"


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


@@ -54,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


@@ -81,14 +88,11 @@ config BR2_TAR_VERBOSITY
        bool 
        default n
 
        bool 
        default n
 

-config BR2_STAGING_DIR
-       string
-       default "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)"
-

 config BR2_JLEVEL
        int
        default "1"
 
 config BR2_JLEVEL
        int
        default "1"
 

+source "target/Config.in"

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

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