From nobody Fri May 08 15:18:08 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 4gBt6Z3WNYz6cSRL for ; Fri, 08 May 2026 15:18:14 +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 4gBt6Z1qMLz4744 for ; Fri, 08 May 2026 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778253494; 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=qwNuBP4an8uoXzZKRsutyarObHF1j74fPaDxlataix8=; b=rHZZlW0m63noaKmn4hp+qcp3l8XosbsQSeuyZuQRTYsYkIqTfzcciTACE84q6JfBkgNazo vzaAIPEPE+RriGWWIhJOoDkQ4UfxAUkPA1BgJ5erdmYeJR2r2hP2UMlnDMhaRVTcK1KmJx Q+xXLemMbLpAXc8diKqnPYDuhHdxYuL1IfNZfW2ISXw5r+bacdD+zVtwZB9jWqs7gAaNcx tjrx80lWCLkm3THI5vJirdH7bQAbv3LFmfLT+AHkyUeixyO6r5w0yNJu+bMsSxZ1VY+QRv BeOhkWb+dinu7FlGmGz/0QjBsJasQIrrHojVl6FOiM3t0FIXecTJ6BuEd7d5sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778253494; a=rsa-sha256; cv=none; b=uwiyHyrjWdntQpmNM9GzDXmW3vcqvI/juNd2XIKSApMXSSAQX6meNy8TLfx4HodKPsLB/G p5esxsrynk9rhf+u/9U5WtO537cp0HiD4sLgzdsYPj65OeSgZNkH15a52KRZMsujgCOio+ aZcpXsL0G4l0gSQGQwwosXMEGoGOWT3KosmVVvBs5bHkn/fwqOehJZnO6MFJSM3DxIfaDO 5+nJV3hGDHMhhVz2kiVBN5Qh+gKZGFJj7ghapZCe3z3lT/2wgNTT2yuxblDoAibfV64Z/Y XDZ1VPiAGCQHd6CQ2xhpNUSsiLrJPJaN/vZ/ZwoxdNtCeJ+mRA7lWykrHP6MHw== 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=1778253494; 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=qwNuBP4an8uoXzZKRsutyarObHF1j74fPaDxlataix8=; b=ZhrYczUkIu3GhQRoud8G/wy5YMgYVRW2cPClNleMICxM/s2lzOM6RrkW//suWLQ8NCigO+ rWzI+JSkBTIDJLzMbXCd2rmIoNgbKQiKxZoj7MBu4HHj/r1pn1wyrjw2ccznu8j72QnqGb xMsCY1k+eRcRMqBHKggftfyJrJDn7MV7MQMk1dDYwrdJn6j4fylBy5Hnbq3Prqy2inYChw 7EqYdMT/RpO3sKcNDQ4DDiWgyC8pDtys+lNCGi6fcwZ6NSGbYBnu/L0bhCyk418WpJh7mx 9BYlV23yfru6ZzWYG3CVewJEchdMZHmloD8URm6wE0eac/wL5I9+DY/kmlf7kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBt6Z0vTYz3k8 for ; Fri, 08 May 2026 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 15:18:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: bd1e789b8452 - main - 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd1e789b8452a8c2f166a3b4defb95330c71dadd Auto-Submitted: auto-generated Date: Fri, 08 May 2026 15:18:08 +0000 Message-Id: <69fdfeb0.308c7.27da5a2b@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=bd1e789b8452a8c2f166a3b4defb95330c71dadd commit bd1e789b8452a8c2f166a3b4defb95330c71dadd Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Alan Somers CommitDate: 2026-05-08 15:17:57 +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. Sponsored by: ConnectWise PR: 295085 MFC after: 1 week Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b07b5f9c1a65..2927054c2e83 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2128,7 +2128,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_CMD} query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2146,6 +2146,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