From nobody Thu May 14 19:05:13 2026 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 4gGfsj5Qqlz5WrRC for ; Thu, 14 May 2026 19:05:13 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsj2rJ7z47R8 for ; Thu, 14 May 2026 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnbRur8/I1bR/BDntt9muU0uOtKNbuy0sZVAyqijNgk=; b=D1oSP0eVqDuTwDZrD50dBkaEHuZlwZ0PY35g7ZOfLc8JyjnS+/YE3igPnBlmzKQYRtZGv1 JrjoItaj8X6Fe7eoqoPyKuh01Z7LOPb1C8WF4O4V+b9VWeiVW101DiJZ4S/6D6SrdQop1/ J1g9o25I8mLzgFVAEiQtMnZbh+uCyDFxrSayzjGH5ZeqrxiMNe+L8tDLeOPDEI3vgqhH46 9l5AAcFSqw3IvS4YglvBql/hNNIAIC+feOxWj4b2A17pgz1dy0VJ8e+7PeLzGgW16u8HJT S7FYw4IW9ZR4GEQt4oBwZcmv2COtmwYb00H/2/Y8CfFPxG3QO51zX8PdLVH30w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785513; a=rsa-sha256; cv=none; b=se/Jt0bbyIeuD84ZZHojgUIGcuYxnoUhWii5qCuUWb1b4mRRC4L6Y/ouTmynLz72oHavzg zYAi7pySKoGYFet6FhlGNfb7kSBB9bPQr/ORtwO/Zpoy3hBPr5VJ1WmQ5utQuj5Dh5AAC4 wrjf+FxGFbVZ/IytoYkczuGjCzJlweiBCi7taQ6rJmMKbrQCOabxazaM1j/zB0d84iyqn7 gZNQ6aTpQWgBcXR8iTt9TsFD1SfrvC0QBCVXa9BketHFvz+41o2dy61U/Sw8X1FlHvF+H8 a2/SpgruQk1VUY1T5rCWRsjhkms8JqhVgvwM9fXkxKNT4CfJAOuXLuIfEWpDRQ== 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=1778785513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnbRur8/I1bR/BDntt9muU0uOtKNbuy0sZVAyqijNgk=; b=u1HUpzzepYyvcfYKEwurE8Wgv/HaLoblRoQgvfkSWOrGLwRmm6M1pvvUYV7gN8KAsi+xzE tVB60gWgOkgsagrnhTw6FNXynssuDtdhkft5jEFtzvOhkOUDiKL4dA3fewCwSVwdSguujP JZpBew1kVnBCbDXz4CP08zGgTOt5SoXFz2repxSLRfMJ8oVqQ92vw03Nzd8Vu4rL6c/H0y I/DroZEh1XgUrgP1Z3N0O76vQHJE4jSJ/0v9uvIbQW7dNMX1UsZN3JYtPqGVguXgR/4i96 3KqmrFPjgzX78pT5TNHBq7JvsTKUTrCtvoDWYw7+9u7Woay2GuwHOON8fmQJLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsj1sGrzqrF for ; Thu, 14 May 2026 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27641 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: 09a53a56b7a6 - releng/15.1 - Make "make update-packages" idempotent 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 09a53a56b7a6892935509e2cda1954fff8078c3f Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:13 +0000 Message-Id: <6a061ce9.27641.6ade658@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=09a53a56b7a6892935509e2cda1954fff8078c3f commit 09a53a56b7a6892935509e2cda1954fff8078c3f Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:52 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Approved by: re (cperciva) Sponsored by: ConnectWise PR: 295085 Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 (cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd) (cherry picked from commit 89a0148521aefe0a190d4b62749186c705962d32) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2255b61a30ff..2c79a8c7920a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2116,7 +2116,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2134,6 +2134,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif