Fix dependency problems:

- Remove lime-eb-ip-tables dependency (packet removed) - Remove udhcpcd dependency: not available anymore as packet (part of BusyBox) - Rename luci-i18n dependency - Remove rdisc6 dependency (not longer available) Signed-off-by: p4u <p4u@dabax.net>
libremesh · Nov 7, 2016 · b410ee5 · b410ee5
1 parent 00ae256
commit b410ee5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/packages/batman-adv-auto-gw-mode/Makefile b/packages/batman-adv-auto-gw-mode/Makefile
@@ -19,7 +19,7 @@ define Package/$(PKG_NAME)
   TITLE:=Set batman-adv gw_mode by internet availability
   MAINTAINER:=Gui Iribarren <gui@altermundi.net>
   URL:=http://libremesh.org
-  DEPENDS:= +kmod-batman-adv +watchping +dnsmasq-dhcpv6 +lime-eb-ip-tables +ip
+  DEPENDS:= +kmod-batman-adv +watchping +dnsmasq-dhcpv6 +ip
 endef
 
 define Package/$(PKG_NAME)/description

diff --git a/packages/bmx6-auto-gw-mode/Makefile b/packages/bmx6-auto-gw-mode/Makefile
@@ -19,7 +19,7 @@ define Package/$(PKG_NAME)
   TITLE:=bmx6 auto Internet gateway module 
   MAINTAINER:=Pau Escrich <p4u@dabax.et>
   URL:=http://libremesh.org
-  DEPENDS:= bmx6 +watchping +lime-eb-ip-tables +ip
+  DEPENDS:= bmx6 +watchping +ip
 endef
 
 define Package/$(PKG_NAME)/description

diff --git a/packages/bmx7-auto-gw-mode/Makefile b/packages/bmx7-auto-gw-mode/Makefile
@@ -19,7 +19,7 @@ define Package/$(PKG_NAME)
   TITLE:=bmx7 auto Internet gateway module 
   MAINTAINER:=Pau Escrich <p4u@dabax.et>
   URL:=http://libremesh.org
-  DEPENDS:= bmx7 +watchping +lime-eb-ip-tables +ip
+  DEPENDS:= bmx7 +watchping +ip
 endef
 
 define Package/$(PKG_NAME)/description

diff --git a/packages/lime-basic/Makefile b/packages/lime-basic/Makefile
@@ -27,7 +27,7 @@ define Package/$(PKG_NAME)
 	DEPENDS:=+lime-system +lime-proto-bmx6 +lime-proto-batadv \
 	         +lime-proto-anygw +lime-proto-wan +dnsmasq-lease-share \
 	         +dnsmasq-distributed-hosts +lime-webui \
-	         +lime-map-agent +lime-eb-ip-tables +lime-hwd-openwrt-wan \
+	         +lime-map-agent +lime-hwd-openwrt-wan \
 	         +bmx6-auto-gw-mode +lime-hwd-ground-routing
 endef
 

diff --git a/packages/lime-debug/Makefile b/packages/lime-debug/Makefile
@@ -24,7 +24,7 @@ define Package/$(PKG_NAME)
 	URL:=http://libremesh.org
 	DEPENDS:=+PACKAGE_lime-proto-batadv:batctl \
        		+busybox +ethtool +iwinfo +iw +mtr +ip +iputils-ping6 +iputils-ping \
-		+sprunge +safe-reboot +netperf +pv +rdisc6 +tcpdump-mini \
+		+sprunge +safe-reboot +netperf +pv +tcpdump-mini \
 		+bwm-ng
 endef
 

diff --git a/packages/lime-proto-wan/Makefile b/packages/lime-proto-wan/Makefile
@@ -22,7 +22,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=LiMe
   MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
   URL:=http://libremesh.org
-  DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat +iptables +udhcpc
+  DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat +iptables
 endef
 
 define Build/Compile

diff --git a/packages/lime-webui/Makefile b/packages/lime-webui/Makefile
@@ -24,7 +24,7 @@ define Package/$(PKG_NAME)
   DEPENDS:= +luci-mod-admin-full \
 	+PACKAGE_lime-proto-bmx6:luci-app-bmx6 +PACKAGE_lime-proto-batadv:luci-app-batman-adv \
 	+luci-mod-status +uhttpd +libiwinfo-lua \
-	+luci-theme-bootstrap +luci-i18n-english \
+	+luci-theme-bootstrap +luci-i18n-base-en \
 	+lime-system
 endef