From: Paul Spooren <mail@aparcar.org>
Date: Fri, 29 Jan 2021 18:31:29 +0000 (-1000)
Subject: build,package-defaults: AUTORELEASE as fallback
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d918e691465ad7c1fffa0a278967d47ee3814fbc;p=openwrt%2Fstaging%2Faparcar.git

build,package-defaults: AUTORELEASE as fallback

This commits changes the package defaults so that $(AUTORELEASE) is used
whenever no explicit PKG_RELEASE is set and $(COMMITCOUNT) whenever
neither is given.

Previously an explicit definition of PKG_RELEASE=$(AUTORELEASE) would be
required.

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

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3ee3a965f2..dd1b62fa8e 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -25,10 +25,14 @@ define Package/Default
     ifneq ($(PKG_RELEASE),)
       VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
     else
-      VERSION:=$(PKG_VERSION)
+      VERSION:=$(PKG_VERSION)-$(AUTORELEASE)
     endif
   else
-    VERSION:=$(PKG_RELEASE)
+    ifneq ($(PKG_RELEASE),)
+      VERSION:=$(PKG_RELEASE)
+    else
+      VERSION:=$(COMMITCOUNT)
+    endif
   endif
   ABI_VERSION:=
   ifneq ($(PKG_FLAGS),)