all: revert freifunk-berlin-generic.mk

Revert the includes to freifunk-berlin-generic.mk and change them to "include $(INCLUDE_DIR)/package.mk" or "include-luci.mk". Add "include-luci.mk" to search the "luci.mk" to include it. Signed-off-by: Nick Hainke <vincent@systemli.org>
freifunk-berlin · Jun 24, 2020 · d637dc1 · d637dc1
1 parent c3c0f4b
commit d637dc1
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 60 deletions.
diff --git a/addons/collectd-addons/Makefile b/addons/collectd-addons/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd-addons
-PKG_VERSION:=0.0.3
+PKG_SOURCE_DATE:=2020-02-29
 PKG_RELEASE:=1
 
 UBIQUITI_MIBS_REL=ubnt-mibs_20171003.zip

diff --git a/addons/freifunk-berlin-bbbdigger/Makefile b/addons/freifunk-berlin-bbbdigger/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-bbbdigger
-PKG_VERSION:=0.0.3
-PKG_RELEASE:=0
+PKG_SOURCE_DATE:=2018-11-02
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/addons/freifunk-berlin-configtools/Makefile b/addons/freifunk-berlin-configtools/Makefile
@@ -8,11 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-configtools
+PKG_SOURCE_DATE:=2019-12-28
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-configtools
   SECTION:=freifunk-berlin

diff --git a/addons/freifunk-berlin-lib-guard/Makefile b/addons/freifunk-berlin-lib-guard/Makefile
@@ -1,9 +1,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-lib-guard
-PKG_RELEASE:=2
+PKG_SOURCE_DATE:=2019-05-25
+PKG_RELEASE:=1
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-lib-guard
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-dhcp-defaults/Makefile b/defaults/freifunk-berlin-dhcp-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-dhcp-defaults
+PKG_SOURCE_DATE:=2019-05-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-dhcp-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-firewall-defaults/Makefile b/defaults/freifunk-berlin-firewall-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-firewall-defaults
+PKG_SOURCE_DATE:=2019-05-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-firewall-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-freifunk-defaults/Makefile b/defaults/freifunk-berlin-freifunk-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-freifunk-defaults
+PKG_SOURCE_DATE:=2019-05-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-freifunk-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-network-defaults/Makefile b/defaults/freifunk-berlin-network-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-network-defaults
+PKG_SOURCE_DATE:=2019-12-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-network-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-olsrd-defaults/Makefile b/defaults/freifunk-berlin-olsrd-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-olsrd-defaults
+PKG_SOURCE_DATE:=2019-05-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-olsrd-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-openvpn-files/Makefile b/defaults/freifunk-berlin-openvpn-files/Makefile
@@ -3,8 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-openvpn-files
+PKG_SOURCE_DATE:=2019-05-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-openvpn-files
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-statistics-defaults/Makefile b/defaults/freifunk-berlin-statistics-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-statistics-defaults
+PKG_SOURCE_DATE:=2020-04-01
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-statistics-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-system-defaults/Makefile b/defaults/freifunk-berlin-system-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-system-defaults
+PKG_SOURCE_DATE:=2020-03-01
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-system-defaults
   SECTION:=freifunk-berlin

diff --git a/defaults/freifunk-berlin-uhttpd-defaults/Makefile b/defaults/freifunk-berlin-uhttpd-defaults/Makefile
@@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-uhttpd-defaults
+PKG_SOURCE_DATE:=2019-05-25
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-uhttpd-defaults
   SECTION:=freifunk-berlin

diff --git a/freifunk-berlin-generic.mk b/freifunk-berlin-generic.mk
diff --git a/include-luci.mk b/include-luci.mk
@@ -0,0 +1,18 @@
+#
+# This is free software, licensed under the GNU General Public License v3.0 .
+#
+
+LUCIMKFILE:=$(wildcard $(TOPDIR)/feeds/*/luci.mk)
+
+# verify that there is only one single file returned
+ifneq (1,$(words $(LUCIMKFILE)))
+ifeq (0,$(words $(LUCIMKFILE)))
+$(error did not find luci.mk in any feed)
+else
+$(error found multiple luci.mk files in the feeds)
+endif
+else
+#$(info found luci.mk at $(LUCIMKFILE))
+endif
+
+include $(LUCIMKFILE)
diff --git a/uplinks/freifunk-berlin-uplink-notunnel/Makefile b/uplinks/freifunk-berlin-uplink-notunnel/Makefile
@@ -2,8 +2,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-uplink-notunnel-files
+PKG_SOURCE_DATE:=2019-12-28
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
   SECTION:=freifunk-berlin

diff --git a/uplinks/freifunk-berlin-uplink-tunnelberlin-files/Makefile b/uplinks/freifunk-berlin-uplink-tunnelberlin-files/Makefile
@@ -2,8 +2,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-uplink-tunnelberlin-files
+PKG_SOURCE_DATE:=2019-12-28
 
-include ../../freifunk-berlin-generic.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-berlin-uplink-tunnelberlin-files/Default
   SECTION:=freifunk-berlin

diff --git a/utils/freifunk-berlin-migration/Makefile b/utils/freifunk-berlin-migration/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-berlin-migration
-PKG_VERSION:=0.6.2
-PKG_RELEASE:=2
+PKG_SOURCE_DATE:=2019-06-19
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/utils/luci-app-ffwizard-berlin/Makefile b/utils/luci-app-ffwizard-berlin/Makefile
@@ -6,7 +6,7 @@ LUCI_TITLE:=Freifunk Berlin configuration wizard
 LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +freifunk-policyrouting +luci-lib-jsonc +community-profiles +luci-lib-ipkg
 PKG_RELEASE:=5
 
-include ../../freifunk-berlin-generic.mk
+include ../../include-luci.mk
 
 #  URL:=http://berlin.freifunk.net
 

diff --git a/utils/luci-app-owm/Makefile b/utils/luci-app-owm/Makefile
@@ -8,13 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-owm
-PKG_RELEASE:=0.4.20
-
+PKG_SOURCE_DATE:=2019-04-12
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/luci-app-owm/default

diff --git a/utils/luci-mod-freifunk-ui/Makefile b/utils/luci-mod-freifunk-ui/Makefile
@@ -12,6 +12,6 @@ LUCI_DEPENDS:=+luci-mod-admin-full +luci-lib-json +community-profiles +luci-lib-
 LUCI_PKGARCH:=all
 PKG_RELEASE:=3
 
-include ../../freifunk-berlin-generic.mk
+include ../../include-luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature