Skip to content

Remove all conditional dependencies #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilario merged 9 commits into from
Oct 10, 2020
Merged

Remove all conditional dependencies #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7108a74
lime-debug never selects batctl
ilario Jan 4, 2020
26410e3
lime-map-agent never selects luci-lib-libremap-bmx6
ilario Jan 4, 2020
92b2743
lime-webui never selects luci-app-bmx6 nor luci-app-batman-adv
ilario Jan 4, 2020
3682986
lime-proto-wan depend on iptables
ilario Sep 23, 2020
2d94779
lime-proto-bmx6 depend on iptables
ilario Sep 23, 2020
952df41
shared-state-dnsmasq_leases remove outdated dependency
ilario Sep 23, 2020
f7760fb
Merge branch 'master' into condicional_dep
ilario Sep 23, 2020
39f56b8
Merge branch 'master' into condicional_dep
spiccinini Oct 8, 2020
58dc639
Add missing include from merge
spiccinini Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/lime-debug/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ define Package/$(PKG_NAME)
CATEGORY:=LiMe
MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
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
Expand Down
2 changes: 1 addition & 1 deletion packages/lime-map-agent/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ define Package/$(PKG_NAME)
MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
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

Expand Down
4 changes: 3 additions & 1 deletion packages/lime-proto-bmx6/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
LIME_TITLE:=LiMe Bmx6 proto support
LIME_MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
LIME_DEPENDS:=+bmx6 +bmx6-json +bmx6-sms +bmx6-table +bmx6-uci-config \
+!PACKAGE_firewall:iptables +lime-system +lua +libuci-lua \
+iptables +lime-system +lua +libuci-lua \
+kmod-ebtables-ipv6 +ebtables

include ../../libremesh.mk

# call BuildPackage - OpenWrt buildroot signature
5 changes: 2 additions & 3 deletions packages/lime-proto-wan/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
LIME_TITLE:=LiMe wan proto support
LIME_MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
LIME_DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat \
+!PACKAGE_firewall:iptables
LIME_DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat +iptables

include ../../libremesh.mk

# call BuildPackage - OpenWrt buildroot signature
# call BuildPackage - OpenWrt buildroot signature
2 changes: 0 additions & 2 deletions packages/lime-webui/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-state-dnsmasq_leases/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ define Package/$(PKG_NAME)
CATEGORY:=LiMe
MAINTAINER:=Gioacchino Mazzurco <gio@altermundi.net>
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
Expand Down