From nobody Fri May 8 15:18:08 2026 X-Original-To: dev-commits-src-main@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 4gBt6T1cC2z6cS97 for ; Fri, 08 May 2026 15:18:09 +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 4gBt6T0tSHz46xn for ; Fri, 08 May 2026 15:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778253489; 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=BSYJBjyIuiNfJfh5sazfpxgo1AN3ETVKgWycrxM1JKK/tzPz15yuhyME5oM6j/dxBjKko8 3tDwEENoGp0Zur4FBZezs+7Qr7lUaSUQ7dCBF3Jg1f6O+KN1HqeQGxXKfEaqu2hDmbp99n ZPGgRXFtJD9vgqxzOBLQI0PLeQTFt5ylhI41+LoNtKZH3zU0qTE1bLaRPait/LwOJT4Y17 NG20UGznwpJE/QT5iD1+dR93m+dR8j6XuKuM4NQvra7FLhTZk45qpFCcEbIBwm0lG/HZnY L6SnNl71TAK6JNhWxUQ1ydBnQLwYBVfglYmmYxWCYLvaJ81Eyy03+zPAZC8d1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778253489; a=rsa-sha256; cv=none; b=lFLopp5lxxangheiXFtcWGRjvW4dh7uMrfxv6Wlw9ajpPTSuDwf//TYbHzdBxeyXiSbKho aYVBSDSNnydBZsgrXexdMZAw4pQvyeCH/scj/+gjykCk3F3xbd+9l9JfwWGp3DOpYmo5BE 7guWLKWcZe4ACb/Q4YxnWDbz0dwQ5oHNpHcwVvA2AzeFFB+TDM+r1OJXg6yg6eCbDNWPkX F79o0lOUDSE7zt7kgTOqWxcQ7gWSLRpmeAm5T6u5P8MkEoLgbvGdWfn/xCihtRF0n3MPnV cjGR6ftp0LNWjcqpMwRG/dMLQFx2ZewUlCmbYPAnOAU46ipbV4nWnN3H59ed8Q== 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=1778253489; 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=onSnuJtzEiqHg/8aRCA5MGws28ZEAu+/ojBmrSjpyNXapKSLgdT2rCTDhmZaba/lQVGxzn Vt75NaGejIkYR793xTYCSIJex0WoNbvEqQVKsyn9ucmrnw0LlemR4Qf3R5V+t0R3qxkMUx ye0tP7H5NXr9Z2nXi5hCFgBW4uRMoX+TvLyIAk2W8GVOyrteDBszmrlUNqRYIziyiQpRaF kIeiKlLCdlhgDvFS3zNFeUGU4Dtv+1v/dK7Pq/KV26v/iy30trwW6IcqeE45BrpGenuD3I wIPUTUCw0JvDO3MnQu6X0tW+3j+v0J5Uic05Mm391J2YWRcMsNJsja3GKWtz2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBt6T0BTzz3k7 for ; Fri, 08 May 2026 15:18:09 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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