From nobody Mon Nov 13 14:47:26 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 4STXMf3N82z51002; Mon, 13 Nov 2023 14:47:26 +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 4STXMf2vfXz3NZp; Mon, 13 Nov 2023 14:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699886846; 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=W7hXwDryhqdDrb+cRKGFSlr/OHsVWxb+MwWzaxrBY/g=; b=MOtR5qnA/Qxk+T2wqrcpBCg8wv2JVmpDyJCG/z3kjzYhvKhWjemZzu+Hcvyn0FGM5isVqa Mz8smuHfoS/BddA+DNDizdUCGFMgVdreY4A8pxAdREcRmjSBmEMsPLkeHb+r/Fk4ywaqC3 tYxrQQXqtp1SyJfREKFfiHRn2d3LUxlhSsL5J87juN7ElKyI4NyV0YuvrDlCkk0ulEGUzd o8/F9G636Cp+o9wa3jQFm2VOTLpshY0hw93M88AQA6Z61j3VeaQ8NyuaBmvEqsYrouTW9u Nkcb7fDMiDoU+wBaVbqCOU3/QMH8gaQUZlu4VzPaac2NWYApvCUM57OdzC9jWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699886846; 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=W7hXwDryhqdDrb+cRKGFSlr/OHsVWxb+MwWzaxrBY/g=; b=CxUzT3jg1qBYFSQ65nax1aIsWnACawCwb/Ws2h4oNd0nelS88pdStH5W+9wXZCOoJUxbOn E51jhwCC8yCHBi9BTrPQIwtO4KOvtRt+1JnpDQSNINyjnbENg15UTT0xRPerpBk+EGRlev 2tH/nJ9WsCKNoS/l5Gx0xWkssneTjfcMKIuAT0Lb9pCPGritMo9LbVnIsik7hrjIUoFDCE vBOM3tblREfv8LLFbGWLht//zHI3ZWqyZ6bsGVqpt9boKdc7Mm0B4+91BlBsnL8j/489fa B5Tvv73u3lroT0iKkQHz4K+tv1gbgtzWLIg5GFr/FA0qwgA+a1t6uPXhITSxdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699886846; a=rsa-sha256; cv=none; b=lGkGmu5YBUrknCjR+PZFAsna94DaJWFJR4EltEN1zpNIg6fsUEM4MGRFZXYnsfs6pvelRe aw/7S0ZvcqIlapdkXu++wP5ftOgG5YbuaskSkls0nsnzwfvUOVbt5RJglzWHm2oBvHxTPX qHXHZS6IjFih7QVBQiHD7++9Muq81LEr/J9H/u5i6sApAyQ8kgOgl5gNDMS+GRzO5pOixO ehtbN/mcl5mSl61NYzFdqaoBSY/53bY8i1dfg3Jrm70sFTK+ZUCqMdmRi6SFqemJqd84dC g3eAR4/Lf8LrR4IdFgpntNMtduOaG6cewC65kBbW3iVATlbljKvWufMe4dtUEg== 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 4STXMf1sMnz18LK; Mon, 13 Nov 2023 14:47:26 +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 3ADElQwC093054; Mon, 13 Nov 2023 14:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADElQMr093051; Mon, 13 Nov 2023 14:47:26 GMT (envelope-from git) Date: Mon, 13 Nov 2023 14:47:26 GMT Message-Id: <202311131447.3ADElQMr093051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 21e9018ae196 - main - 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: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21e9018ae19662db643a21064150da866bc7beb4 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=21e9018ae19662db643a21064150da866bc7beb4 commit 21e9018ae19662db643a21064150da866bc7beb4 Author: Doug Rabson AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Doug Rabson CommitDate: 2023-11-13 14:46:36 +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 --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c1c0b56efd1b..c1dfb84538af 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)