From nobody Thu Jun 27 09:00:51 2024 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 4W8swz4Wyqz5PGC9; Thu, 27 Jun 2024 09:00:51 +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 4W8swz3vV6z4X56; Thu, 27 Jun 2024 09:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478851; 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=RRjH000rQHZwJ06yOur/4qWNjJiuE/QOThlCIwCL66k=; b=WvjhHR7grBxd4dGUHM0wfIwtWyPmfKK7NIMHtd8VK6Q6UFTM1DMWeYhBt+OoZnOyGveHE7 Qv7+K+5lsGLAgbD/8KAXHt3ecra9/anZvlMTIbv3vlatj78kagKwvNBZTQ8wlwAL6AkuOs eayzBIT8qPP6EZPthk7eWETB/he0hjclf2TU3DOtz0P1XvZ+Ukzy+zm0xjTwP1+XIeF2b1 2Dl2EzpQ44aYjZh6kTVDpGO6nL9ZPufK1sYhp7zQFPnHrbvHXdsLMDBhTbdxKXB9ij64cE xAuezifPHBTQev8RH2BBOpZ8tGD9crlVnwTG1DdwfuAFyvq7lnF4NtnCL5dgNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478851; a=rsa-sha256; cv=none; b=UxuuwKyTJG6AH+KGcg3+3I7WuJE3gp6C3rzqFIBMsvCSFKQ15yNpnjqNUn1Khn3hE8XQv+ U1AQlGO9zTkV0IhSFv8Avv8oFXvyjA9e2c4zpTPCnMFfekQRr27d6FH9p8t8bD57op3rp8 uy+0moZiM38ABn0//drcKyQnvvR5IedS6cmA8EE2wp8dDkVCDNJ7ZVeTuwJZeKyniP+Mcc EAv6Khe/9Yhz61YMr8/iKcsyJldIQNeJcRdFQbeHi4b95iEvaVm499VWkGoFyYLFkgZJIk Pw8j33QWmUUHO7vv49XjZMX8cjkIrMYtjfOkDJXbpk3T60mnq6LwYFyvT2gvYQ== 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=1719478851; 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=RRjH000rQHZwJ06yOur/4qWNjJiuE/QOThlCIwCL66k=; b=M2LVwrvXfRoUc0WjTmRKx2iYUM3Fiu8W+qKzQkyiVlypyY55kMfZB/rzm7OYrb73o5IgFZ pym4WJnMQRkLEHx+/Zw1nrHstzNfDwkyMitWljacXyA3pRp1s2ZEcpezoW5UmNeONuw9lg zlpo/yUfNP5Xh+j6WahRPgy/3mnBHG2cucSv4xM5QRhxLIq5HnhV9168803NQMuhImeVxO wPRIvcEfls6BzFZTZGuaKM25/Je2Tm2S+hu6bTC6OozR243RbOgvc/wVEEBmSR/laV/2Zf QipDfM8JVg439yYXC+PIWuVgY91irhNULUngSeSIqEqKnOvtD3CbEJ2JvlScSw== 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 4W8swz3W1fz1L8P; Thu, 27 Jun 2024 09:00:51 +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 45R90pKJ020783; Thu, 27 Jun 2024 09:00:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R90pHF020780; Thu, 27 Jun 2024 09:00:51 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:00:51 GMT Message-Id: <202406270900.45R90pHF020780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d45717e497d1 - stable/14 - release: don't keep old packages if the BRANCH changes 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d45717e497d10d6f6584e10d39a13a4e5dcd214d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d45717e497d10d6f6584e10d39a13a4e5dcd214d commit d45717e497d10d6f6584e10d39a13a4e5dcd214d Author: Siva Mahadevan AuthorDate: 2024-06-05 18:11:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:58:52 +0000 release: don't keep old packages if the BRANCH changes (cherry picked from commit 4231a5e5040403f4ae46a63bf6e1209d5eb7adb8) --- Makefile.inc1 | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 141a18d7b745..b2e7be43f2ee 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -550,17 +550,23 @@ MAJOR_REVISION= ${_REVISION:R} _PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} +BRANCH_EXT= .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} _PKG_REVISION= ${MAJOR_REVISION} -EXTRA_REVISION= .snap${_TIMENOW} +BRANCH_EXT= snap +EXTRA_REVISION= .${BRANCH_EXT}${_TIMENOW} .elif ${_BRANCH:MALPHA*} -EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= a${_BRANCH:C/ALPHA([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:MBETA*} -EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= b${_BRANCH:C/BETA([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:MRC*} -EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= rc${_BRANCH:C/RC([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:M*-p*} -EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +BRANCH_EXT= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +EXTRA_REVISION= ${BRANCH_EXT} .endif PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif @@ -1995,9 +2001,11 @@ PKG_EXT= pkg .if exists(${REPODIR}/${PKG_ABI}) PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest PKG_VERSION_FROM_DIR= ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM} +BRANCH_EXT_FROM= ${PKG_VERSION_FROM:C/.*([[:alpha:]][^\.]*).*/\1/} .else PKG_VERSION_FROM= PKG_VERSION_FROM_DIR= +BRANCH_EXT_FROM= .endif .endif .endif @@ -2035,7 +2043,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "$${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" == "$${newsum}" ]; then \ echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \