From owner-dev-commits-src-main@freebsd.org Thu Jan 14 13:17:40 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BDA74E1DCD;
Thu, 14 Jan 2021 13:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DGlGr0m25z3qT1;
Thu, 14 Jan 2021 13:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CC8A2649;
Thu, 14 Jan 2021 13:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10EDHdrZ051644;
Thu, 14 Jan 2021 13:17:39 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10EDHdT6051643;
Thu, 14 Jan 2021 13:17:39 GMT (envelope-from git)
Date: Thu, 14 Jan 2021 13:17:39 GMT
Message-Id: <202101141317.10EDHdT6051643@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 03cab14ea3a8 - main - Revert "pkgbase: differentiate package
versions for ALPHA/BETA/PRERELEASE/RC phases"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 03cab14ea3a8e0444cec2ec3844e0648bd60bb58
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2021 13:17:40 -0000
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=03cab14ea3a8e0444cec2ec3844e0648bd60bb58
commit 03cab14ea3a8e0444cec2ec3844e0648bd60bb58
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-01-14 13:15:05 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-01-14 13:15:05 +0000
Revert "pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases"
This reverts commit aef769614f921660cb0262412426034cf5395ae5.
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.
---
Makefile.inc1 | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 2242ca3be5b4..5a9eff870dd5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -557,25 +557,21 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA
.endif
.if !defined(PKG_VERSION)
-_STRTIMENOW= %Y%m%d%H%M%S
-_TIMENOW= ${_STRTIMENOW:gmtime}
-.if ${_BRANCH:MCURRENT*}
-_REVISION:= ${_REVISION:R}
-EXTRA_REVISION= .s${_TIMENOW}
-.elif ${_BRANCH:MSTABLE*}
-EXTRA_REVISION= s${_TIMENOW}
-.elif ${_BRANCH:MPRERELEASE*}
-EXTRA_REVISION= .p
+.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*}
+TIMENOW= %Y%m%d%H%M%S
+EXTRA_REVISION= .s${TIMENOW:gmtime}
.elif ${_BRANCH:MALPHA*}
-EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}
+EXTRA_REVISION= _${_BRANCH:C/-ALPHA/.a/}
.elif ${_BRANCH:MBETA*}
-EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/}
+EXTRA_REVISION= _${_BRANCH:C/-BETA/.b/}
.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*}
EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/}
.endif
-PKG_VERSION:= ${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
+PKG_VERSION:= ${_REVISION}${EXTRA_REVISION}
.endif
.endif # !defined(PKG_VERSION)