From nobody Wed May 13 19:24:20 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 4gG3LL0B8pz6css2 for ; Wed, 13 May 2026 19:24: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3LK6jPfz3QYk for ; Wed, 13 May 2026 19:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700266; 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=h6r5iO42P5Sw+TGZT+bVahHEsfIkbTx+DHtMi5G4Zqg=; b=S8LuDlzBhYCwyUzwQvN1mtC/OnqaXffuwgkpCihe0qnNPZ+9RK6pRVwBcPmSTU496AdQbr B/4gQQt3SHqnyeGFNvrMtx2FFCJGpeZnYKFU5Ew5hLGG4O8iaXXpbIUVAEStAr910sje0+ RA2WknIwYGs5nSFH2pmS8LOkvsEBxzkrHf24g4QciB6nxZnOlGUjOHL90BgN3+okSBoxqt g0kFnmYbBHPmQ5XzCAOljbGxav2L/jsOZzyeBr2v65quvzZndCHwmaCLcR3ENUIsac3z2S BggW2s2WyA9ie5BOrjnbcOFTXaQC+V15R1KUA7//5KOwr5GVbAgKEKDvTbGEwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778700265; a=rsa-sha256; cv=none; b=dVTl0tKA5+MUawfIetmmw+2UvPn5MMvi/mxWWvfBumVkAhIvY5QgKLr/G02vcPGfD3S8yr ALgejY4SMOPUJqPxVE7qkRJZjjEQ+ESFRvIfv751i5wXtroQ9kb+Hj3oaS9G/+A2Ha3HEi npa6Odvn9QxFGdYLjNtU/4L+vG+lssdtU0+HN68u5jnR7AD10DPR8pN3dt19/YVAVRJu4T ziHVLHOxMvedRrwCiEAb1rlXHShvqHJQsK24wq4ChLheX9h4ZlnguUS0FwnEmjJgsbURNO FcKg6fw4TOZjFgTAxVeD2J9ACAMiavVDDBuQQVdHw7SDTGpXo1jxLvz4Oq1VDg== 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=1778700265; 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=h6r5iO42P5Sw+TGZT+bVahHEsfIkbTx+DHtMi5G4Zqg=; b=hnsKjMdmPnmp404kIOKhMjRuVuN5UsadeS0QpxUAR+tX6FYVVk/2ZjjLArG1mdHusZKqre 55FbU8ap6Zwo2fTaw6c3EzfD5rR8Za56hOB9CAfk/sPNnScjyXrNAxeB4+YSUpfNsGsId2 qS+N6E0zRyaohqKkwqPHqS5n1KeX8YySNDIQZR4OBTIOyj2nbaErIu3P8+2rgLKuvkd8pf 4LRqEGIb/TERY8XFW6sjP1K1xInOEPmyXm2vukYliY5RBSQKqvnLEbyXRviO7d6qrDzjMF veJmiLrimylWR6EvFPI/D39y5SsJ7xyO9Fw13o+1U78CE6YahEvM4nP2hEdL8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3LK6Dw3z14DG for ; Wed, 13 May 2026 19:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 276ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:24:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 89a0148521ae - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 89a0148521aefe0a190d4b62749186c705962d32 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:24:20 +0000 Message-Id: <6a04cfe4.276ab.2e6106ed@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=89a0148521aefe0a190d4b62749186c705962d32 commit 89a0148521aefe0a190d4b62749186c705962d32 Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Alan Somers CommitDate: 2026-05-13 17:23:07 +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 Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 (cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd) --- 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