From: Paul Spooren Date: Fri, 29 Jan 2021 09:17:10 +0000 (-1000) Subject: rules: fix empty COMMITCOUNT/AUTORELEASE X-Git-Tag: v21.02.0-rc1~392 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=ddab795b370da986149f8c8e6b3455bf9c1066fe rules: fix empty COMMITCOUNT/AUTORELEASE 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 Makefile:48: *** Package/px5g-wolfssl is missing the VERSION field. Stop. Reported-by: Daniel Golle Reported-by: Stijn Segers Reported-by: Stijn Tintel Signed-off-by: Paul Spooren --- diff --git a/rules.mk b/rules.mk index b1b69eabf9..b658e93020 100644 --- a/rules.mk +++ b/rules.mk @@ -431,8 +431,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: ;