[PATCH] rules: fix empty COMMITCOUNT/AUTORELEASE

Paul Spooren mail at aparcar.org
Fri Jan 29 04:25:57 EST 2021


Packages that are in-tree only often lack a PKG_VERSION and only use the
PKG_RELEASE to mark changes. Using COMMITCOUNT/AUTORELEASE variables
causes an issue as both variables are empty during the metadata DUMP
phase.

Instead of leaving these variables empty and causing an error message
like below, set the variables to 0 during dumping. On actual building
the variable is evaluated causing in a value above 0.

ERROR: please fix package/utils/px5g-wolfssl/Makefile - \
	see logs/package/utils/px5g-wolfssl/dump.txt for details

Reported-by: Borromini @ IRC
Reported-by: Daniel Golle <daniel at makrotopia.org>
Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 rules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules.mk b/rules.mk
index 1b63b8fc45..fc2c2efa2d 100644
--- a/rules.mk
+++ b/rules.mk
@@ -432,8 +432,8 @@ $(shell \
 )
 endef
 
-COMMITCOUNT = $(if $(DUMP),,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),,$(call commitcount,1))
+COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
+AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
 
 all:
 FORCE: ;
-- 
2.29.2




More information about the openwrt-devel mailing list