From 27baecaf37434835a02814fe58b847fb9f4c3467 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 26 Feb 2021 21:42:00 +0100 Subject: [PATCH] treewide: set PKG_RELEASE automatically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit COMMITCOUNT allows to have the PKG_RELEASE calculated automatically based on the number of commits for the package folder. AUTORELEASE will count the number of commits since the last upstream bump. This is relevant for packages with PKG_VERSION or PKG_SOURCE_DATE set, but will not work for us since it assumes the use of certain identifiers in commit titles. COMMITCOUNT works fine for most of our packages, with the following exceptions: * fff-nodewatcher would yield a commit count of 55, while the current PKG_RELEASE is 61. Thus, we do not touch it for now. * Packages that have been renamed will start counting from 1 after the rename, since folder renames are not tracked by git. This will result in descreasing PKG_RELEASE after the change for these packages. However, since moving essentially creates a new package anyway, counting from 1 makes sense conceptually, and PKG_RELEASE is still replaced for these packages. * alfred-json and fff-macnock use upstream code and thus would normally require AUTORELEASE. As discussed above, this will not work for us, so just leave these two untouched. Note that all this is quite irrelevant for the way we use packages currently, as without opkg PKG_RELEASE does not matter to us anyway. So, let's just be happy about not having to bump PKG_RELEASE anymore, while keeping the basic functionality intact. The only package where the PKG_RELEASE is actually used for something is fff-nodewatcher, where the version will be displayed in the Monitoring. Signed-off-by: Adrian Schmutzler [fabian@blaese.de: rebase, add new packages] Signed-off-by: Fabian Bläse Reviewed-by: Robert Langhammer Reviewed-by: Johannes Kimmel --- src/packages/fff/fff-alfred-monitoring-proxy/Makefile | 2 +- src/packages/fff/fff-alfred/Makefile | 2 +- src/packages/fff/fff-babeld/Makefile | 2 +- src/packages/fff/fff-batman-adv/Makefile | 2 +- src/packages/fff/fff-boardname/Makefile | 2 +- src/packages/fff/fff-config/Makefile | 2 +- src/packages/fff/fff-dhcp/Makefile | 2 +- src/packages/fff/fff-fastd/Makefile | 2 +- src/packages/fff/fff-firewall/Makefile | 2 +- src/packages/fff/fff-hoods/Makefile | 2 +- src/packages/fff/fff-hoodutils/Makefile | 2 +- src/packages/fff/fff-layer3-config/Makefile | 2 +- src/packages/fff/fff-layer3-snat/Makefile | 2 +- src/packages/fff/fff-layer3/Makefile | 2 +- src/packages/fff/fff-mqtt-monitoring/Makefile | 2 +- src/packages/fff/fff-mqtt/Makefile | 2 +- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-node/Makefile | 2 +- src/packages/fff/fff-ra/Makefile | 2 +- src/packages/fff/fff-random/Makefile | 2 +- src/packages/fff/fff-simple-tc/Makefile | 2 +- src/packages/fff/fff-support/Makefile | 2 +- src/packages/fff/fff-sysupgrade/Makefile | 2 +- src/packages/fff/fff-timeserver/Makefile | 2 +- src/packages/fff/fff-uradvd/Makefile | 2 +- src/packages/fff/fff-vpn-select/Makefile | 2 +- src/packages/fff/fff-vxlan-node-vpn/Makefile | 2 +- src/packages/fff/fff-web-hood/Makefile | 2 +- src/packages/fff/fff-web-mqtt/Makefile | 2 +- src/packages/fff/fff-web-ui/Makefile | 2 +- src/packages/fff/fff-wireguard/Makefile | 2 +- src/packages/fff/fff-wireless/Makefile | 2 +- src/packages/fff/fff/Makefile | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile index 85af561..3a297b8 100644 --- a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile +++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-alfred-monitoring-proxy -PKG_RELEASE:=5 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-alfred/Makefile b/src/packages/fff/fff-alfred/Makefile index b556531..75d9301 100644 --- a/src/packages/fff/fff-alfred/Makefile +++ b/src/packages/fff/fff-alfred/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-alfred -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-babeld/Makefile b/src/packages/fff/fff-babeld/Makefile index 0f0dd9a..2231e20 100644 --- a/src/packages/fff/fff-babeld/Makefile +++ b/src/packages/fff/fff-babeld/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-babeld -PKG_RELEASE:=8 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-batman-adv/Makefile b/src/packages/fff/fff-batman-adv/Makefile index 9b879aa..cbd5ed1 100644 --- a/src/packages/fff/fff-batman-adv/Makefile +++ b/src/packages/fff/fff-batman-adv/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-batman-adv -PKG_RELEASE:=4 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile index 089f5b7..ed04eae 100644 --- a/src/packages/fff/fff-boardname/Makefile +++ b/src/packages/fff/fff-boardname/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-boardname -PKG_RELEASE:=8 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-config/Makefile b/src/packages/fff/fff-config/Makefile index abf1ae6..7817d29 100644 --- a/src/packages/fff/fff-config/Makefile +++ b/src/packages/fff/fff-config/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-config -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-dhcp/Makefile b/src/packages/fff/fff-dhcp/Makefile index bf454dd..0acd58b 100644 --- a/src/packages/fff/fff-dhcp/Makefile +++ b/src/packages/fff/fff-dhcp/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-dhcp -PKG_RELEASE:=6 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-fastd/Makefile b/src/packages/fff/fff-fastd/Makefile index 19aaf03..b5b0525 100644 --- a/src/packages/fff/fff-fastd/Makefile +++ b/src/packages/fff/fff-fastd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-fastd -PKG_RELEASE:=5 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-firewall/Makefile b/src/packages/fff/fff-firewall/Makefile index 18dd2bd..dec7d74 100644 --- a/src/packages/fff/fff-firewall/Makefile +++ b/src/packages/fff/fff-firewall/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-firewall -PKG_RELEASE:=9 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile index c28fd4a..98ce70a 100644 --- a/src/packages/fff/fff-hoods/Makefile +++ b/src/packages/fff/fff-hoods/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-hoods -PKG_RELEASE:=19 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-hoodutils/Makefile b/src/packages/fff/fff-hoodutils/Makefile index e3c06e7..7b50e18 100644 --- a/src/packages/fff/fff-hoodutils/Makefile +++ b/src/packages/fff/fff-hoodutils/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-hoodutils -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-layer3-config/Makefile b/src/packages/fff/fff-layer3-config/Makefile index 3b9761f..8bcb9fc 100644 --- a/src/packages/fff/fff-layer3-config/Makefile +++ b/src/packages/fff/fff-layer3-config/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-layer3-config -PKG_RELEASE:=9 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-layer3-snat/Makefile b/src/packages/fff/fff-layer3-snat/Makefile index 0e82310..b1f2757 100644 --- a/src/packages/fff/fff-layer3-snat/Makefile +++ b/src/packages/fff/fff-layer3-snat/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-layer3-snat -PKG_RELEASE:=1 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-layer3/Makefile b/src/packages/fff/fff-layer3/Makefile index 2d7de3c..2cd9a4d 100644 --- a/src/packages/fff/fff-layer3/Makefile +++ b/src/packages/fff/fff-layer3/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-layer3 -PKG_RELEASE:=9 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-mqtt-monitoring/Makefile b/src/packages/fff/fff-mqtt-monitoring/Makefile index 7ef991e..f495f98 100644 --- a/src/packages/fff/fff-mqtt-monitoring/Makefile +++ b/src/packages/fff/fff-mqtt-monitoring/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-mqtt-monitoring -PKG_RELEASE:=1 +PKG_RELEASE:=$(COMMITCOUNT) PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt-monitoring diff --git a/src/packages/fff/fff-mqtt/Makefile b/src/packages/fff/fff-mqtt/Makefile index 8c79161..0125575 100644 --- a/src/packages/fff/fff-mqtt/Makefile +++ b/src/packages/fff/fff-mqtt/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-mqtt -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 62c6b6a..5586360 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-network -PKG_RELEASE:=50 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-node/Makefile b/src/packages/fff/fff-node/Makefile index bdcc92a..a22bd94 100644 --- a/src/packages/fff/fff-node/Makefile +++ b/src/packages/fff/fff-node/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-node -PKG_RELEASE:=4 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-ra/Makefile b/src/packages/fff/fff-ra/Makefile index 78cdefe..8022fb6 100644 --- a/src/packages/fff/fff-ra/Makefile +++ b/src/packages/fff/fff-ra/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-ra -PKG_RELEASE:=3 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-random/Makefile b/src/packages/fff/fff-random/Makefile index cc07bdb..f680ca8 100644 --- a/src/packages/fff/fff-random/Makefile +++ b/src/packages/fff/fff-random/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-random -PKG_RELEASE:=3 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-simple-tc/Makefile b/src/packages/fff/fff-simple-tc/Makefile index e86005a..536df45 100644 --- a/src/packages/fff/fff-simple-tc/Makefile +++ b/src/packages/fff/fff-simple-tc/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-simple-tc -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-support/Makefile b/src/packages/fff/fff-support/Makefile index f309477..c907330 100644 --- a/src/packages/fff/fff-support/Makefile +++ b/src/packages/fff/fff-support/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-support -PKG_RELEASE:=9 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile index 354b1d0..5eb8e0b 100644 --- a/src/packages/fff/fff-sysupgrade/Makefile +++ b/src/packages/fff/fff-sysupgrade/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-sysupgrade -PKG_RELEASE:=13 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-timeserver/Makefile b/src/packages/fff/fff-timeserver/Makefile index eb5e2ea..16249ef 100644 --- a/src/packages/fff/fff-timeserver/Makefile +++ b/src/packages/fff/fff-timeserver/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-timeserver -PKG_RELEASE:=3 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-uradvd/Makefile b/src/packages/fff/fff-uradvd/Makefile index 731aae2..7007d2b 100644 --- a/src/packages/fff/fff-uradvd/Makefile +++ b/src/packages/fff/fff-uradvd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-uradvd -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn-select/Makefile index ff06df9..8e4725c 100644 --- a/src/packages/fff/fff-vpn-select/Makefile +++ b/src/packages/fff/fff-vpn-select/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-vpn-select -PKG_RELEASE:=6 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-vxlan-node-vpn/Makefile b/src/packages/fff/fff-vxlan-node-vpn/Makefile index bfb6beb..376a5a2 100644 --- a/src/packages/fff/fff-vxlan-node-vpn/Makefile +++ b/src/packages/fff/fff-vxlan-node-vpn/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-vxlan-node-vpn -PKG_RELEASE:=1 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-web-hood/Makefile b/src/packages/fff/fff-web-hood/Makefile index 15d2df2..1decc28 100644 --- a/src/packages/fff/fff-web-hood/Makefile +++ b/src/packages/fff/fff-web-hood/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web-hood -PKG_RELEASE:=2 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-web-mqtt/Makefile b/src/packages/fff/fff-web-mqtt/Makefile index efef8b9..a22a476 100644 --- a/src/packages/fff/fff-web-mqtt/Makefile +++ b/src/packages/fff/fff-web-mqtt/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web-mqtt -PKG_RELEASE:=1 +PKG_RELEASE:=$(COMMITCOUNT) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-web-ui/Makefile b/src/packages/fff/fff-web-ui/Makefile index fcde373..c3af1ed 100644 --- a/src/packages/fff/fff-web-ui/Makefile +++ b/src/packages/fff/fff-web-ui/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web-ui -PKG_RELEASE:=18 +PKG_RELEASE:=$(shell echo -n $$(( $(COMMITCOUNT) + 20 ))) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-wireguard/Makefile b/src/packages/fff/fff-wireguard/Makefile index ac34040..64ec4f5 100644 --- a/src/packages/fff/fff-wireguard/Makefile +++ b/src/packages/fff/fff-wireguard/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-wireguard -PKG_RELEASE:=8 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile index 6ae2dce..2f557df 100644 --- a/src/packages/fff/fff-wireless/Makefile +++ b/src/packages/fff/fff-wireless/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-wireless -PKG_RELEASE:=20 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile index 3dae038..4915793 100644 --- a/src/packages/fff/fff/Makefile +++ b/src/packages/fff/fff/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff -PKG_RELEASE:=9 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk