Merge pull request #288 from chris5560/master

Modified dependencies
2015-01-10 22:39:41 +01:00 · 2015-01-10 22:39:41 +01:00 · c5477f717d
commit c5477f717d
parent 9a81d8ff32 42757cb549
3 changed files with 3 additions and 3 deletions
--- a/collections/luci/Makefile
+++ b/collections/luci/Makefile
@ -12,7 +12,7 @@ LUCI_BASENAME:=luci
 LUCI_TITLE:=Standard OpenWrt set including full admin with ppp support and the default Bootstrap theme
 LUCI_DEPENDS:= \
 	+uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \
-	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua +luci-lib-nixio
+	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua

 include ../../luci.mk

--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@ -12,7 +12,7 @@ LUCI_TYPE:=mod
 LUCI_BASENAME:=base

 LUCI_TITLE:=LuCI core libraries
-LUCI_DEPENDS:=+lua +libuci-lua +libubus-lua +luci-lib-nixio
+LUCI_DEPENDS:=+lua +libuci-lua +luci-lib-nixio

 PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
 PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files
--- a/modules/luci-mod-admin-full/Makefile
+++ b/modules/luci-mod-admin-full/Makefile
@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk

 LUCI_TITLE:=LuCI Administration - full-featured for full control
-LUCI_DEPENDS:=+luci-base
+LUCI_DEPENDS:=+luci-base +libubus-lua

 PKG_BUILD_DEPENDS:=iwinfo