apps/examples/thttpd now uses the Union File System if BINFS is selected for CGI binaris

This commit is contained in:
Gregory Nutt 2015-06-06 12:39:57 -06:00
parent f6a1963219
commit 44a23bd26b
2 changed files with 10 additions and 8 deletions

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# configs/lincoln60/nsh/setenv.sh # configs/lincoln60/netnsh/setenv.sh
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -448,6 +448,7 @@ CONFIG_NETDEVICES=y
# CONFIG_ETH0_PHY_NONE is not set # CONFIG_ETH0_PHY_NONE is not set
# CONFIG_ETH0_PHY_AM79C874 is not set # CONFIG_ETH0_PHY_AM79C874 is not set
CONFIG_ETH0_PHY_KS8721=y CONFIG_ETH0_PHY_KS8721=y
# CONFIG_ETH0_PHY_KSZ8041 is not set
# CONFIG_ETH0_PHY_KSZ8051 is not set # CONFIG_ETH0_PHY_KSZ8051 is not set
# CONFIG_ETH0_PHY_KSZ8061 is not set # CONFIG_ETH0_PHY_KSZ8061 is not set
# CONFIG_ETH0_PHY_KSZ8081 is not set # CONFIG_ETH0_PHY_KSZ8081 is not set
@ -654,10 +655,11 @@ CONFIG_FS_READABLE=y
# CONFIG_FS_RAMMAP is not set # CONFIG_FS_RAMMAP is not set
# CONFIG_FS_FAT is not set # CONFIG_FS_FAT is not set
# CONFIG_FS_NXFFS is not set # CONFIG_FS_NXFFS is not set
# CONFIG_FS_ROMFS is not set CONFIG_FS_ROMFS=y
# CONFIG_FS_SMARTFS is not set # CONFIG_FS_SMARTFS is not set
CONFIG_FS_BINFS=y CONFIG_FS_BINFS=y
# CONFIG_FS_PROCFS is not set # CONFIG_FS_PROCFS is not set
CONFIG_FS_UNIONFS=y
# #
# System Logging # System Logging
@ -687,8 +689,7 @@ CONFIG_MM_REGIONS=2
# Binary Loader # Binary Loader
# #
# CONFIG_BINFMT_DISABLE is not set # CONFIG_BINFMT_DISABLE is not set
CONFIG_BINFMT_EXEPATH=y # CONFIG_BINFMT_EXEPATH is not set
CONFIG_PATH_INITIAL="/bin"
# CONFIG_NXFLAT is not set # CONFIG_NXFLAT is not set
# CONFIG_ELF is not set # CONFIG_ELF is not set
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
@ -788,6 +789,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_POSIXSPAWN is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set
# CONFIG_EXAMPLES_QENCODER is not set # CONFIG_EXAMPLES_QENCODER is not set
# CONFIG_EXAMPLES_RGMP is not set # CONFIG_EXAMPLES_RGMP is not set
# CONFIG_EXAMPLES_ROMFS is not set
# CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SENDMAIL is not set
# CONFIG_EXAMPLES_SERIALBLASTER is not set # CONFIG_EXAMPLES_SERIALBLASTER is not set
# CONFIG_EXAMPLES_SERIALRX is not set # CONFIG_EXAMPLES_SERIALRX is not set
@ -803,6 +805,7 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
# CONFIG_EXAMPLES_TIFF is not set # CONFIG_EXAMPLES_TIFF is not set
# CONFIG_EXAMPLES_TOUCHSCREEN is not set # CONFIG_EXAMPLES_TOUCHSCREEN is not set
# CONFIG_EXAMPLES_WEBSERVER is not set # CONFIG_EXAMPLES_WEBSERVER is not set
# CONFIG_EXAMPLES_UNIONFS is not set
# CONFIG_EXAMPLES_USBSERIAL is not set # CONFIG_EXAMPLES_USBSERIAL is not set
# CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_USBTERM is not set
# CONFIG_EXAMPLES_WATCHDOG is not set # CONFIG_EXAMPLES_WATCHDOG is not set
@ -841,11 +844,10 @@ CONFIG_THTTPD_PORT=80
CONFIG_THTTPD_IPADDR=0x0a000002 CONFIG_THTTPD_IPADDR=0x0a000002
CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org" CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org"
CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX" CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX"
# CONFIG_THTTPD_NXFLAT is not set
CONFIG_THTTPD_BINFS=y CONFIG_THTTPD_BINFS=y
CONFIG_THTTPD_PATH="/bin" CONFIG_THTTPD_PATH="/mnt/www"
CONFIG_THTTPD_CGI_PATH="/bin" CONFIG_THTTPD_CGI_PATH="/mnt/www/cgi-bin"
CONFIG_THTTPD_CGI_PATTERN="/bin/*" CONFIG_THTTPD_CGI_PATTERN="/mnt/www/cgi-bin/*"
CONFIG_THTTPD_CGI_PRIORITY=100 CONFIG_THTTPD_CGI_PRIORITY=100
CONFIG_THTTPD_CGI_STACKSIZE=2048 CONFIG_THTTPD_CGI_STACKSIZE=2048
CONFIG_THTTPD_CGI_BYTECOUNT=20000 CONFIG_THTTPD_CGI_BYTECOUNT=20000