Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rules: fix COMMITCOUNT logic

Browse Source 
The newly added $(COMMITCOUNT) variable was wrongly increased by plus
one. The addition should have been only added to $(AUTORELEASE) as
OpenWrt traditionally starts counting at one rather than zero.

$(AUTORELEASE) counts the commits since the last bump, which is zero on
the version bump commit itself.

This commit increases $(AUTORELEASE) by one while leaving $(COMMITCOUNT)
as is.

The base-files package is the only package using $(COMMITCOUNT) so far
and requires a pseudo commit to keep the PKG_RELEASE correct. A non
functional change (Copyright bump) is done in the next commit.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2021-01-26 17:16:36 -10:00
parent ff2087d9a9
commit 513f7171a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules.mk
View File

@ -421,7 +421,7 @@ $(shell \
if [ -n "$$last_bump" ]; then \ if [ -n "$$last_bump" ]; then \
echo -n $$(($$(git rev-list --count "$$last_bump..HEAD" .) + 1)); \ echo -n $$(($$(git rev-list --count "$$last_bump..HEAD" .) + 1)); \
else \ else \
echo -n $$(($$(git rev-list --count HEAD .) + 1)); \ git rev-list --count HEAD .; \
fi; \ fi; \
else \ else \
secs="$$(($(SOURCE_DATE_EPOCH) % 86400))"; \ secs="$$(($(SOURCE_DATE_EPOCH) % 86400))"; \