projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/package: make sgi-uhttpd and uhttpd tls support optional
[project/luci.git]
/
contrib
/
package
/
luci
/
Makefile
diff --git
a/contrib/package/luci/Makefile
b/contrib/package/luci/Makefile
index
5cfab4c
..
6229646
100644
(file)
--- a/
contrib/package/luci/Makefile
+++ b/
contrib/package/luci/Makefile
@@
-275,7
+275,7
@@
endef
-NIXIO_TLS:=
cyassl
+NIXIO_TLS:=
define Package/luci-nixio
$(call Package/luci/libtemplate)
define Package/luci-nixio
$(call Package/luci/libtemplate)
@@
-290,7
+290,10
@@
endef
define Package/luci-nixio/config
choice
prompt "TLS Provider"
define Package/luci-nixio/config
choice
prompt "TLS Provider"
- default PACKAGE_luci-nixio_cyassl
+ default PACKAGE_luci-nixio_notls
+
+ config PACKAGE_luci-nixio_notls
+ bool "Disabled"
config PACKAGE_luci-nixio_axtls
bool "Builtin (axTLS)"
config PACKAGE_luci-nixio_axtls
bool "Builtin (axTLS)"
@@
-344,7
+347,7
@@
endef
define Package/luci-web
$(call Package/luci/libtemplate)
DEPENDS+=+luci-http +luci-sys +luci-nixio +luci-uci \
define Package/luci-web
$(call Package/luci/libtemplate)
DEPENDS+=+luci-http +luci-sys +luci-nixio +luci-uci \
- +luci-sgi-cgi +luci-
sgi-uhttpd +luci-
lmo
+ +luci-sgi-cgi +luci-lmo
TITLE:=MVC Webframework
$(call Config,luci.main.lang,string,auto,Default Language)
endef
TITLE:=MVC Webframework
$(call Config,luci.main.lang,string,auto,Default Language)
endef
@@
-779,7
+782,7
@@
endef
define Package/luci-sgi-uhttpd
$(call Package/luci/webservertemplate)
TITLE:=Binding for the uHTTPd server
define Package/luci-sgi-uhttpd
$(call Package/luci/webservertemplate)
TITLE:=Binding for the uHTTPd server
- DEPENDS+=+uhttpd +
px5g
+ DEPENDS+=+uhttpd +
uhttpd-mod-lua
endef
define Package/luci-sgi-uhttpd/install
endef
define Package/luci-sgi-uhttpd/install