d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases"

Browse Source 
This reverts commit aef769614f.

While the package names are a bit prettier this confuse pkg about upgrading :
$ pkg version -t 13.0.s2021011313063 13.0.a1
>
$ pkg version -t 13.0.s2021011313063 13.0_ALPHA1
<

Note that the current scheme isn't good when bumping from ALPHA to BETA or
even BETA to RC:
$ pkg version -t 13.0_ALPHA1 13.0_BETA1
=
$ pkg version -t 13.0_BETA1 13.0_RC1
=

But more thoughts have to be put into this renaming.
This commit is contained in:
Emmanuel Vadot 2021-01-14 14:15:05 +01:00
parent aef769614f
commit 03cab14ea3
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.inc1
View File

@ -557,25 +557,21 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA
.endif .endif
.if !defined(PKG_VERSION) .if !defined(PKG_VERSION)
_STRTIMENOW= %Y%m%d%H%M%S .if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*}
_TIMENOW= ${_STRTIMENOW:gmtime} TIMENOW= %Y%m%d%H%M%S
.if ${_BRANCH:MCURRENT*} EXTRA_REVISION= .s${TIMENOW:gmtime}
_REVISION:= ${_REVISION:R}
EXTRA_REVISION= .s${_TIMENOW}
.elif ${_BRANCH:MSTABLE*}
EXTRA_REVISION= s${_TIMENOW}
.elif ${_BRANCH:MPRERELEASE*}
EXTRA_REVISION= .p
.elif ${_BRANCH:MALPHA*} .elif ${_BRANCH:MALPHA*}
EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/} EXTRA_REVISION= _${_BRANCH:C/-ALPHA/.a/}
.elif ${_BRANCH:MBETA*} .elif ${_BRANCH:MBETA*}
EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/} EXTRA_REVISION= _${_BRANCH:C/-BETA/.b/}
.elif ${_BRANCH:MRC*} .elif ${_BRANCH:MRC*}
EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/} EXTRA_REVISION= _${_BRANCH:C/-RC/.r/}
.elif ${_BRANCH:MPRERELEASE*}
EXTRA_REVISION= _${_BRANCH:C/-PRERELEASE/.p/}
.elif ${_BRANCH:M*-p*} .elif ${_BRANCH:M*-p*}
EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/} EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/}
.endif .endif
PKG_VERSION:= ${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} PKG_VERSION:= ${_REVISION}${EXTRA_REVISION}
.endif .endif
.endif # !defined(PKG_VERSION) .endif # !defined(PKG_VERSION)