From ac16b4a424b5761950a7b8d7fd7b439fe334e58d Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Fri, 19 Apr 2019 19:47:15 +0200 Subject: [PATCH] treewide: include freifunk.mk in place of out-of-feed luci.mk Use the new freifunk.mk file to reach the macros and definitions of the former luci.mk. Signed-off-by: Sven Roederer --- applications/luci-app-freifunk-diagnostics/Makefile | 2 +- applications/luci-app-freifunk-policyrouting/Makefile | 2 +- applications/luci-app-freifunk-widgets/Makefile | 2 +- applications/luci-app-meshwizard/Makefile | 2 +- modules/luci-mod-freifunk-community/Makefile | 2 +- modules/luci-mod-freifunk/Makefile | 6 ++++-- themes/luci-theme-freifunk-generic/Makefile | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/applications/luci-app-freifunk-diagnostics/Makefile b/applications/luci-app-freifunk-diagnostics/Makefile index d511684b6..e4a2f8541 100644 --- a/applications/luci-app-freifunk-diagnostics/Makefile +++ b/applications/luci-app-freifunk-diagnostics/Makefile @@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Tools for network diagnosis like traceroute and ping LUCI_DEPENDS:= -include ../../luci.mk +include ../../freifunk.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-freifunk-policyrouting/Makefile b/applications/luci-app-freifunk-policyrouting/Makefile index f60c2ea05..f5316b5ca 100644 --- a/applications/luci-app-freifunk-policyrouting/Makefile +++ b/applications/luci-app-freifunk-policyrouting/Makefile @@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Policy routing for mesh traffic LUCI_DEPENDS:=+freifunk-policyrouting -include ../../luci.mk +include ../../freifunk.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-freifunk-widgets/Makefile b/applications/luci-app-freifunk-widgets/Makefile index d748827ba..7cfba356d 100644 --- a/applications/luci-app-freifunk-widgets/Makefile +++ b/applications/luci-app-freifunk-widgets/Makefile @@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Widgets for the Freifunk index page LUCI_DEPENDS:=+luci-mod-freifunk -include ../../luci.mk +include ../../freifunk.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-meshwizard/Makefile b/applications/luci-app-meshwizard/Makefile index fb2610eb0..d95799606 100644 --- a/applications/luci-app-meshwizard/Makefile +++ b/applications/luci-app-meshwizard/Makefile @@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Shellscript based wizard to setup mesh networks LUCI_DEPENDS:=+meshwizard -include ../../luci.mk +include ../../freifunk.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/modules/luci-mod-freifunk-community/Makefile b/modules/luci-mod-freifunk-community/Makefile index ad6c4ce2e..b789c7cd2 100644 --- a/modules/luci-mod-freifunk-community/Makefile +++ b/modules/luci-mod-freifunk-community/Makefile @@ -13,7 +13,7 @@ LUCI_DEPENDS:= \ +olsrd-mod-watchdog +kmod-tun +ip +freifunk-watchdog +luci-app-olsr \ +luci-app-olsr-services +freifunk-gwcheck +freifunk-mapupdate -include ../../luci.mk +include ../../freifunk.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/modules/luci-mod-freifunk/Makefile b/modules/luci-mod-freifunk/Makefile index d4ddd22ef..a15426d61 100644 --- a/modules/luci-mod-freifunk/Makefile +++ b/modules/luci-mod-freifunk/Makefile @@ -6,7 +6,9 @@ include $(TOPDIR)/rules.mk -FF_TITLE:=LuCI Freifunk module -FF_DEPENDS:=+luci-mod-admin-full +luci-lib-json +luci-lib-ipkg +freifunk-firewall +freifunk-common +LUCI_TITLE:=LuCI Freifunk module +LUCI_DEPENDS:=+luci-mod-admin-full +luci-lib-json +luci-lib-ipkg +freifunk-firewall +freifunk-common include ../../freifunk.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/themes/luci-theme-freifunk-generic/Makefile b/themes/luci-theme-freifunk-generic/Makefile index 2fc62fdbc..639560437 100644 --- a/themes/luci-theme-freifunk-generic/Makefile +++ b/themes/luci-theme-freifunk-generic/Makefile @@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Freifunk Generic Theme LUCI_DEPENDS:= -include ../../luci.mk +include ../../freifunk.mk # call BuildPackage - OpenWrt buildroot signature