From nobody Tue Dec 05 18:27:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CX4KDZz53JPY; Tue, 5 Dec 2023 18:27:36 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CX3qPgz3Z8s; Tue, 5 Dec 2023 18:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBo0r4Ox4YRdhsjs/I3FMcRyb9ig8PzTYM7e68RwkKM=; b=S6qlHayXZ+QdmK04rRJsJKtoGa0LUOH4YyIXxwrrEAD/iI+A/21zSFHclSR2Agi8TbSRIq WP2EEXBXgs9QZ7EY6r6iIkRE/cmFu4xHUaG4C6u6EW7R1aVsEvE1lmUbWPKJAb21482VDo a3dGn/HzqZ35rVmtTuAWvsSNxvJcYE47//E7MqqZWuaOVQJ2az9RXmOQSW+4XQa6bw5weA FSVPnJjOvA5sZ73lYKEpYo+kKIiBk3tSzpDXknBZQjuiydy7oplIrwqD7JE195pSNqjKwp cklIyU0DuhH+HzKpwXdT29iUjxtrKdaxtUleliRFxn49pUOPjUmf71hcEQdUtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800856; a=rsa-sha256; cv=none; b=FhxHkxxE5NVzhxEVu8/ph1cQ3AcF0Cyaq4A9uDQzfpHDjQKDnKbZDNyQxdi83avOXWYz+E 4ROB8ViGQHkTkBFNeV8St4g5YIBekpjwu1/KsvUiNmq8O843cHz8YLDwhbySdecO4iMZ5j ya6VLk2wI47FMI3FAhvUbjSrVXgOyJDL5ZR2pNm9NFih4sR+gwXrWYug33qv06geCFjpek UiOkkfiv5G3E0LtxVD2SLJtCz9gLRaFF7tn7zkfoDgmu5uwXWTzZhRkNUu1hKmjYnIKRI+ E1GjQ7EpWyjQ/p3RmzGXqzB+yfVPZaHobamKe11F1m63wWY0fXAj744HkWuKZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBo0r4Ox4YRdhsjs/I3FMcRyb9ig8PzTYM7e68RwkKM=; b=pbPoEDB8MDPo18/hl8XLBZd4w4csC7Pc0U8VVsNQ1oPiZJGktvR7Tptcv64zUD2P4atYLp wQcnISK4LBJa5BbQyo/sJaQ9gnKd/8n7RcPnP0PWLiXq0DbIeAnBvlAPOiqWma7nP8FBVg xt4S8WHdOBTc19e+pCHqwK49P1AGgfsi4DBmQCPySvqrsmZhyAh0vY2A47gGrlqMWeJNhm Z775dx+/e78qdXMjES+pNVVDoiQ6F6RSgJmFIG5wpO+YQBrrjXENClualt4DqBNeDygnpe K/C6hcvxIiMqd6ZaERPA/d8O8apZ0nnfkOzXu+nBp/SQERPBjLZXsHhE5kU4jQ== 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 4Sl8CX2vsRz55C; Tue, 5 Dec 2023 18:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRaO9009357; Tue, 5 Dec 2023 18:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRaLA009354; Tue, 5 Dec 2023 18:27:36 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:36 GMT Message-Id: <202312051827.3B5IRaLA009354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ad3edd66d15e - releng/14.0 - pkgbase: use . format for alpha, beta and release package versions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad3edd66d15e6af1bf7e393a01f1a126dfa55fff commit ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Author: Doug Rabson AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:05:27 +0000 pkgbase: use . format for alpha, beta and release package versions This is consistent with version numbers used in releng/13.2. PR: 275051 Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42562 Approved by: so Security: FreeBSD-EN-23:19.pkgbase (cherry picked from commit 21e9018ae19662db643a21064150da866bc7beb4) (cherry picked from commit da7e9601a99afd3f8777f6ae62fd51e601e15085) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01d3328726bd..12397abeedb2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -547,9 +547,11 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA MAJOR_REVISION= ${_REVISION:R} .if !defined(PKG_VERSION) +_PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} +_PKG_REVISION= ${MAJOR_REVISION} EXTRA_REVISION= .snap${_TIMENOW} .elif ${_BRANCH:MALPHA*} EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} @@ -560,7 +562,7 @@ EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:M*-p*} EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .endif -PKG_VERSION:= ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} +PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif .endif # !defined(PKG_VERSION)