From 4d9b83cb8ae14a340c237ddf41f77a32b950128e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 9 Nov 2022 12:12:42 +0000 Subject: [PATCH] freifunk: don't pull uhttpd-mod-lua Dependencies in LiMe became more complex which lead to several circular dependencies. Remove dependency on 'uhttpd-mod-lua' to hopefully resolve this issue for the freifunk community profiles. This should fix #83. Signed-off-by: Daniel Golle --- freifunk/80211s-sae-batadv-only/Makefile | 2 +- freifunk/80211s-sae-bmx7-batadv/Makefile | 2 +- freifunk/80211s-sae-bmx7-only/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freifunk/80211s-sae-batadv-only/Makefile b/freifunk/80211s-sae-batadv-only/Makefile index d1175eb..d26fbb6 100644 --- a/freifunk/80211s-sae-batadv-only/Makefile +++ b/freifunk/80211s-sae-batadv-only/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PROFILE_DESCRIPTION:=Use 802.11s with SAE for mesh, route with batman-adv only -PROFILE_DEPENDS:+wpad-mesh-wolfssl +lime-proto-batadv +lime-proto-anygw +uhttpd-mod-lua +shared-state +shared-state-bat_hosts +shared-state-dnsmasq_hosts +shared-state-dnsmasq_leases +PROFILE_DEPENDS:=+wpad-mesh-wolfssl +lime-proto-batadv +lime-proto-anygw +shared-state +shared-state-bat_hosts +shared-state-dnsmasq_hosts +shared-state-dnsmasq_leases +wifi-unstuck-wa include ../../profile.mk diff --git a/freifunk/80211s-sae-bmx7-batadv/Makefile b/freifunk/80211s-sae-bmx7-batadv/Makefile index 8b98e2c..6ff5cb3 100644 --- a/freifunk/80211s-sae-bmx7-batadv/Makefile +++ b/freifunk/80211s-sae-bmx7-batadv/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PROFILE_DESCRIPTION:=Use 802.11s with SAE for mesh, route with bmx7 and batman-adv -PROFILE_DEPENDS:=+wpad-mesh-wolfssl +wpa-cli +bmx7 +bmx7-iwinfo +bmx7-json +bmx7-sms +bmx7-table +bmx7-tun +bmx7-uci-config +lime-proto-batadv +bmx7-auto-gw-mode +lime-proto-bmx7 +lime-proto-anygw +uhttpd-mod-lua +shared-state +shared-state-dnsmasq_hosts +shared-state-dnsmasq_leases +shared-state-bat_hosts +wifi-unstuck-wa +PROFILE_DEPENDS:=+wpad-mesh-wolfssl +wpa-cli +bmx7 +bmx7-iwinfo +bmx7-json +bmx7-sms +bmx7-table +bmx7-tun +bmx7-uci-config +lime-proto-batadv +bmx7-auto-gw-mode +lime-proto-bmx7 +lime-proto-anygw +shared-state +shared-state-dnsmasq_hosts +shared-state-dnsmasq_leases +shared-state-bat_hosts +wifi-unstuck-wa include ../../profile.mk diff --git a/freifunk/80211s-sae-bmx7-only/Makefile b/freifunk/80211s-sae-bmx7-only/Makefile index 79f9365..9780ff1 100644 --- a/freifunk/80211s-sae-bmx7-only/Makefile +++ b/freifunk/80211s-sae-bmx7-only/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PROFILE_DESCRIPTION:=Use 802.11s with SAE for mesh, route with bmx7 only -PROFILE_DEPENDS:=+wpad-mesh-wolfssl +wpa-cli +bmx7 +bmx7-iwinfo +bmx7-json +bmx7-sms +bmx7-table +bmx7-tun +bmx7-uci-config +bmx7-auto-gw-mode +lime-proto-bmx7 +lime-proto-anygw +uhttpd-mod-lua +shared-state +shared-state-dnsmasq_hosts +shared-state-dnsmasq_leases +wifi-unstuck-wa +PROFILE_DEPENDS:=+wpad-mesh-wolfssl +wpa-cli +bmx7 +bmx7-iwinfo +bmx7-json +bmx7-sms +bmx7-table +bmx7-tun +bmx7-uci-config +bmx7-auto-gw-mode +lime-proto-bmx7 +lime-proto-anygw +shared-state +shared-state-dnsmasq_hosts +shared-state-dnsmasq_leases +wifi-unstuck-wa include ../../profile.mk