Merge pull request #288 from chris5560/master

Modified dependencies

diff --git a/collections/luci/Makefile b/collections/luci/Makefile
index dff5be67fad2ac947a4eb2dd8df5ed1bf34908d5..ace4735a030a3ddb201129a5575b14b4792d4144 100644 (file)
--- 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
 

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 395e7c753cd813ad3b4b82615b4524dda357f5c2..15aababbb784f7447625a4b019fe08577405af53 100644 (file)
--- 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

diff --git a/modules/luci-mod-admin-full/Makefile b/modules/luci-mod-admin-full/Makefile
index 5fed2797ec4ab269e716ecb085a88d20afc11edb..66c78e28a9cb646d012fb84e4c961091a1afb6ee 100644 (file)
--- 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