summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-03-27 20:56:28 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-03-27 20:56:28 +0000
commit1c8dffdffe1981f32e5df7e87c02b0423b6db6cc (patch)
tree5335495bcba518bf2dd38977e21282a99bc2c5aa
parent7af6503b1e70b5f6d80db7433904bc6baefb08a3 (diff)
contrib/package: make luci depend on uhttpd, add luci-ssl collection
-rw-r--r--contrib/package/luci/Makefile22
1 files changed, 18 insertions, 4 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 6229646c8..c3ee83f94 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -780,7 +780,7 @@ define Package/luci-sgi-cgi/install
endef
define Package/luci-sgi-uhttpd
- $(call Package/luci/webservertemplate)
+ $(call Package/luci/libtemplate)
TITLE:=Binding for the uHTTPd server
DEPENDS+=+uhttpd +uhttpd-mod-lua
endef
@@ -990,8 +990,9 @@ endef
### Collections ###
define Package/luci
$(call Package/luci/collectiontemplate)
- TITLE:=Standard OpenWrt Kamikaze set including full and mini admin and the standard theme
- DEPENDS:=+luci-admin-full +luci-admin-mini +luci-theme-openwrt +luci-app-firewall +luci-app-initmgr
+ TITLE:=Standard OpenWrt set including full and mini admin and the standard theme
+ DEPENDS:=+uhttpd +luci-admin-full +luci-admin-mini +luci-theme-openwrt \
+ +luci-app-firewall +luci-app-initmgr
endef
define Package/luci/install
@@ -999,10 +1000,22 @@ define Package/luci/install
endef
+define Package/luci-ssl
+ $(call Package/luci/collectiontemplate)
+ TITLE:=Standard OpenWrt set with https support
+ DEPENDS:=+uhttpd +uhttpd-mod-tls +px5g +luci-admin-full +luci-admin-mini \
+ +luci-theme-openwrt +luci-app-firewall +luci-app-initmgr
+endef
+
+define Package/luci-ssl/install
+ true
+endef
+
+
define Package/luci-light
$(call Package/luci/collectiontemplate)
TITLE:=Minimum package set using only admin mini and a theme without grafics
- DEPENDS:=+luci-admin-mini +luci-theme-openwrtlight
+ DEPENDS:=+uhttpd +luci-admin-mini +luci-theme-openwrtlight
endef
define Package/luci-light/install
@@ -1324,4 +1337,5 @@ $(eval $(call BuildPackage,luci-i18n-spanish))
$(eval $(call BuildPackage,luci-i18n-vietnamese))
$(eval $(call BuildPackage,luci))
+$(eval $(call BuildPackage,luci-ssl))
$(eval $(call BuildPackage,luci-light))