freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

treewide: set PKG_RELEASE automatically 

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 <freifunk@adrianschmutzler.de>
[fabian@blaese.de: rebase, add new packages]
Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
Reviewed-by: Johannes Kimmel <fff@bareminimum.eu>
This commit is contained in:
Adrian Schmutzler 2021-02-26 21:42:00 +01:00 committed by Fabian Bläse
parent 825d760bd8
commit 27baecaf37
33 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/packages/fff/fff-alfred-monitoring-proxy/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-alfred-monitoring-proxy PKG_NAME:=fff-alfred-monitoring-proxy
PKG_RELEASE:=5 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-alfred/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-alfred PKG_NAME:=fff-alfred
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-babeld/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-babeld PKG_NAME:=fff-babeld
PKG_RELEASE:=8 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-batman-adv/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-batman-adv PKG_NAME:=fff-batman-adv
PKG_RELEASE:=4 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-boardname/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-boardname PKG_NAME:=fff-boardname
PKG_RELEASE:=8 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-config/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-config PKG_NAME:=fff-config
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-dhcp/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-dhcp PKG_NAME:=fff-dhcp
PKG_RELEASE:=6 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-fastd/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-fastd PKG_NAME:=fff-fastd
PKG_RELEASE:=5 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-firewall/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-firewall PKG_NAME:=fff-firewall
PKG_RELEASE:=9 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-hoods/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-hoods PKG_NAME:=fff-hoods
PKG_RELEASE:=19 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-hoodutils/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-hoodutils PKG_NAME:=fff-hoodutils
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-layer3-config/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-layer3-config PKG_NAME:=fff-layer3-config
PKG_RELEASE:=9 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-layer3-snat/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-layer3-snat PKG_NAME:=fff-layer3-snat
PKG_RELEASE:=1 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-layer3/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-layer3 PKG_NAME:=fff-layer3
PKG_RELEASE:=9 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-mqtt-monitoring/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-mqtt-monitoring PKG_NAME:=fff-mqtt-monitoring
PKG_RELEASE:=1 PKG_RELEASE:=$(COMMITCOUNT)
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt-monitoring PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt-monitoring

2
src/packages/fff/fff-mqtt/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-mqtt PKG_NAME:=fff-mqtt
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt

2
src/packages/fff/fff-network/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-network PKG_NAME:=fff-network
PKG_RELEASE:=50 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-node/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-node PKG_NAME:=fff-node
PKG_RELEASE:=4 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-ra/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-ra PKG_NAME:=fff-ra
PKG_RELEASE:=3 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-random/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-random PKG_NAME:=fff-random
PKG_RELEASE:=3 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-simple-tc/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-simple-tc PKG_NAME:=fff-simple-tc
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-support/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-support PKG_NAME:=fff-support
PKG_RELEASE:=9 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-sysupgrade/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-sysupgrade PKG_NAME:=fff-sysupgrade
PKG_RELEASE:=13 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-timeserver/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-timeserver PKG_NAME:=fff-timeserver
PKG_RELEASE:=3 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-uradvd/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-uradvd PKG_NAME:=fff-uradvd
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-vpn-select/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-vpn-select PKG_NAME:=fff-vpn-select
PKG_RELEASE:=6 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-vxlan-node-vpn/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-vxlan-node-vpn PKG_NAME:=fff-vxlan-node-vpn
PKG_RELEASE:=1 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-web-hood/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-web-hood PKG_NAME:=fff-web-hood
PKG_RELEASE:=2 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-web-mqtt/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-web-mqtt PKG_NAME:=fff-web-mqtt
PKG_RELEASE:=1 PKG_RELEASE:=$(COMMITCOUNT)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-web-ui/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-web-ui PKG_NAME:=fff-web-ui
PKG_RELEASE:=18 PKG_RELEASE:=$(shell echo -n $$(( $(COMMITCOUNT) + 20 )))
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-wireguard/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-wireguard PKG_NAME:=fff-wireguard
PKG_RELEASE:=8 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff-wireless/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-wireless PKG_NAME:=fff-wireless
PKG_RELEASE:=20 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
src/packages/fff/fff/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff PKG_NAME:=fff
PKG_RELEASE:=9 PKG_RELEASE:=$(COMMITCOUNT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk