From: Paul Spooren <mail@aparcar.org>
Date: Sat, 2 Jan 2021 00:18:32 +0000 (-1000)
Subject: base-files: use $(COMMITCOUNT) in PKG_RELEASE
X-Git-Tag: v21.02.0-rc1~460
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=aa589c77b4e431455f2de225bbf38a391f76aad6;p=openwrt%2Fopenwrt.git

base-files: use $(COMMITCOUNT) in PKG_RELEASE

The newly added `$(COMMITCOUNT)` varialbe allows automatic versioning
based on the number of Git commits of a package. Replace *tedious to
bump* and *merge conflict causing* `PKG_RELEASE` and replace it with
`$(COMMITCOUNT)`.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f18f221129..d134641cb9 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,8 +12,8 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=246
 PKG_FLAGS:=nonshared
+PKG_RELEASE:=$(COMMITCOUNT)
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=usign/host ucert/host