From 7108a745bbdabd76a74dc1c8ae2b475e0ce314c5 Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Sat, 4 Jan 2020 17:44:02 +0100 Subject: [PATCH 1/7] lime-debug never selects batctl --- packages/lime-debug/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lime-debug/Makefile b/packages/lime-debug/Makefile index 85f7c2cc5..05bb2a7a4 100644 --- a/packages/lime-debug/Makefile +++ b/packages/lime-debug/Makefile @@ -21,7 +21,7 @@ define Package/$(PKG_NAME) CATEGORY:=LiMe MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+PACKAGE_lime-proto-batadv:batctl +bandwidth-test \ + DEPENDS:=+bandwidth-test \ +busybox +ethtool +iwinfo +iw +mtr +ip +iputils-ping6 +iputils-ping \ +sprunge +safe-reboot +netperf +pv +tcpdump-mini +bwm-ng \ +lime-report From 26410e37ad98f2248901689b4783e75d69f41de0 Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Sat, 4 Jan 2020 17:45:30 +0100 Subject: [PATCH 2/7] lime-map-agent never selects luci-lib-libremap-bmx6 --- packages/lime-map-agent/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lime-map-agent/Makefile b/packages/lime-map-agent/Makefile index 747e10a11..e20151756 100644 --- a/packages/lime-map-agent/Makefile +++ b/packages/lime-map-agent/Makefile @@ -22,7 +22,7 @@ define Package/$(PKG_NAME) MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org DEPENDS:=+libremap-agent +luci-lib-libremap-location +luci-lib-libremap-system +luci-lib-libremap-wireless \ - +PACKAGE_lime-proto-bmx6:luci-lib-libremap-bmx6 +luci-app-lime-location + +luci-app-lime-location PKGARCH:=all endef From 92b27438a3297f3d934db0a56110c9c93405aece Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Sat, 4 Jan 2020 17:50:11 +0100 Subject: [PATCH 3/7] lime-webui never selects luci-app-bmx6 nor luci-app-batman-adv --- packages/lime-webui/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/lime-webui/Makefile b/packages/lime-webui/Makefile index abdb040c2..de9eb7d6c 100644 --- a/packages/lime-webui/Makefile +++ b/packages/lime-webui/Makefile @@ -26,8 +26,6 @@ define Package/$(PKG_NAME) MENU:=1 PKGARCH:=all DEPENDS:=+luci-base +lime-system \ - +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-base-en \ +LIMEWEBUI_ES:luci-i18n-base-es +LIMEWEBUI_PT:luci-i18n-base-pt \ From 36829869f0ee86e5a1f6dc7df8363248eb9f5e97 Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Wed, 23 Sep 2020 21:07:40 +0200 Subject: [PATCH 4/7] lime-proto-wan depend on iptables --- packages/lime-proto-wan/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lime-proto-wan/Makefile b/packages/lime-proto-wan/Makefile index a9fbb086f..54f87f3e2 100644 --- a/packages/lime-proto-wan/Makefile +++ b/packages/lime-proto-wan/Makefile @@ -21,7 +21,7 @@ define Package/$(PKG_NAME) CATEGORY:=LiMe MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat +!PACKAGE_firewall:iptables + DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat +iptables PKGARCH:=all endef From 2d94779cc7ef0723c206e96b98cd76942f5bfcca Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Wed, 23 Sep 2020 21:10:07 +0200 Subject: [PATCH 5/7] lime-proto-bmx6 depend on iptables --- packages/lime-proto-bmx6/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lime-proto-bmx6/Makefile b/packages/lime-proto-bmx6/Makefile index 86f93e7b9..77f6b2dca 100644 --- a/packages/lime-proto-bmx6/Makefile +++ b/packages/lime-proto-bmx6/Makefile @@ -21,7 +21,7 @@ define Package/$(PKG_NAME) CATEGORY:=LiMe MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=+bmx6 +bmx6-json +bmx6-sms +bmx6-table +bmx6-uci-config +!PACKAGE_firewall:iptables \ + DEPENDS:=+bmx6 +bmx6-json +bmx6-sms +bmx6-table +bmx6-uci-config +iptables \ +lime-system +lua +libuci-lua +PACKAGE_lime-proto-batadv:kmod-ebtables-ipv6 PKGARCH:=all endef From 952df41243e88ddb4de9ad27541c748f8ae42ade Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Wed, 23 Sep 2020 21:11:22 +0200 Subject: [PATCH 6/7] shared-state-dnsmasq_leases remove outdated dependency --- packages/shared-state-dnsmasq_leases/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared-state-dnsmasq_leases/Makefile b/packages/shared-state-dnsmasq_leases/Makefile index ca53bf04f..1d2276a4a 100644 --- a/packages/shared-state-dnsmasq_leases/Makefile +++ b/packages/shared-state-dnsmasq_leases/Makefile @@ -19,7 +19,7 @@ define Package/$(PKG_NAME) CATEGORY:=LiMe MAINTAINER:=Gioacchino Mazzurco URL:=http://libremesh.org - DEPENDS:=@(!PACKAGE_dnsmasq-lease-share) +libuci-lua +lua \ + DEPENDS:=+libuci-lua +lua \ +luci-lib-jsonc shared-state +shared-state-dnsmasq_hosts \ +luci-lib-nixio PKGARCH:=all From 58dc63911e8f0f8f5d50c1fa15549911d5a415e0 Mon Sep 17 00:00:00 2001 From: Santiago Piccinini Date: Thu, 8 Oct 2020 20:53:53 -0300 Subject: [PATCH 7/7] Add missing include from merge --- packages/lime-proto-bmx6/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/lime-proto-bmx6/Makefile b/packages/lime-proto-bmx6/Makefile index 2b2da9d5e..6f706199f 100644 --- a/packages/lime-proto-bmx6/Makefile +++ b/packages/lime-proto-bmx6/Makefile @@ -4,4 +4,6 @@ LIME_DEPENDS:=+bmx6 +bmx6-json +bmx6-sms +bmx6-table +bmx6-uci-config \ +iptables +lime-system +lua +libuci-lua \ +kmod-ebtables-ipv6 +ebtables +include ../../libremesh.mk + # call BuildPackage - OpenWrt buildroot signature