From nobody Thu Nov 16 08:22:15 2023 X-Original-To: dev-commits-src-branches@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 4SWCgr5Ydbz51LNt; Thu, 16 Nov 2023 08:22:16 +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 4SWCgr13M6z3bj8; Thu, 16 Nov 2023 08:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700122936; 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=/JJk2XV9tgP4hBjPphJk7WNYhHeRq4o8Bf5peY6eu34=; b=FHtHpzOG9By3U1USDhYZXF4uQ0DJCiymF5GB1OBB6C/fSIG/w8v1lJKMPsCqmOHkzmrQW6 u2UOU5ODx7DTaIZMMKEjdNbkSRMDuQ9kdcVnbA4z266ZZL2ffudWwztbNVkXGBtPGNmIom I7ywTA+6kbWJB8NAtu5KEQleczo/KE2PXe+/oQHT+pLtDmAlYtXds1fB2GJLCH328sItm8 LxKzcRew040O1Qp4Gf2G1DRUF9o90tevgV2WKpWsZ0b9X6Z3ROz+ExgGxedIacCAXPTwlq c67nMoTGMXTE6DRM77+tdDgEIWHVZmmuzzPrifFHeAKzZRgdrgdsBfLuuSk9TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700122936; 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=/JJk2XV9tgP4hBjPphJk7WNYhHeRq4o8Bf5peY6eu34=; b=ZQkbUt33PLalv+XCGdhP7JXTGm/6zY+a//ToDm2oApZqq4kSw6oNoUwJUpC1JM67PmHrYP YHhbEzztD5/jDIGwQnUScnGBKhp8erp/1K5A+lQzlAcxgeYQhpqB+WZk0xbFw96azNXD+y SxPBh7/X1zv1j/w+HZ6cpZm62l/jJOxviDAn0N8Ddsnxzgf5WtKV/ZAiUimgz2jIW1N2pk 1hsRJfpsoOhraFBoiEGnSJsQ10oOz/DEEVn0oi8KBdjbNzcyq1p0qYWVmYb8dc7My5gqFl qG3B3qRS44vgc7WZNcvH6knrwu/CKZl6GcSRtrOqrrfFtr9t8+tKZJITeQdF9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700122936; a=rsa-sha256; cv=none; b=que/nIJZCP/xy+PEFvRJpuo4gbrw02ZXrYqOwR7h+K6ljKa8x7Rf4OeAaQhT35v4HsWuQr /hMgpWr8nhdIk3abDPVUhd6SV5krIa8S+hhh9WAVjMf0LAjZayR5RrfhD2sLRILuPUXKIV FI+6FFHAbpdQ7FlomhF4VPcNS9g6FPbXW/G/CIlluPrwHQliQC+c8B1BvEUQ+fbrCwBQcR Bhv/WuaU3U7DRnepfhCcNCFBoKeBb2Fa3zGpB5Aro2u9e2Lq5LnobL+0Ot8dEmC35r5Wmp Eb/XSD7jvHamZiQpIG60crvm2RYNZtby9dpWzxXhmCUVjVtoADk6NcDtOvBjhw== 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 4SWCgr06P4zsRq; Thu, 16 Nov 2023 08:22:16 +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 3AG8MFWh099907; Thu, 16 Nov 2023 08:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AG8MF0p099904; Thu, 16 Nov 2023 08:22:15 GMT (envelope-from git) Date: Thu, 16 Nov 2023 08:22:15 GMT Message-Id: <202311160822.3AG8MF0p099904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: da7e9601a99a - stable/14 - pkgbase: use . format for alpha, beta and release package versions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da7e9601a99afd3f8777f6ae62fd51e601e15085 Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=da7e9601a99afd3f8777f6ae62fd51e601e15085 commit da7e9601a99afd3f8777f6ae62fd51e601e15085 Author: Doug Rabson AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Doug Rabson CommitDate: 2023-11-16 08:19:08 +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 (cherry picked from commit 21e9018ae19662db643a21064150da866bc7beb4) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 4f564547bc84..46663e72750b 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)