From nobody Sat Jul 25 13:07:57 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 4h6lXG1yq3z6lNDF for ; Sat, 25 Jul 2026 13:07:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6lXF6tJ4z3lk3 for ; Sat, 25 Jul 2026 13:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984878; 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=ISfBsDR0veLGi3A3Ir2aDVrRq+Gx9Y4SR4C4YYRfXVo=; b=vCkHRW8sk01qiAs5AoohrcCZGEV4q+uoJ27pLnWWdtH4j7EaTXXx9ie5ysKbHygzgDKTQb MxlmfXUmWYUAlVRMCvlMcpAed3spUov0cLk85ogRwuinx88Dhvvi7S0pYR1ARLC3/fUnwZ /Ouxzge4XUqMyhUPORAXGKuWPOAHfVqQWJLc6jUhJeRgLL4eGlIKFgJMFEX2bY/3tHylMk Axm6Vv1F4BynRGvSfLa2zO63qHzvMojd64q7jKNSutHqFQqe+H4jU9DQg9/+J1k1drJZX2 0teKlv+DF5QaD5/qguunlPwOqG4y+sLHwvPFOTxV4VVfFmeQDol5bxvGeuRLwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784984878; a=rsa-sha256; cv=none; b=tRTZWWibvVPHz+xjf+81/imddfy3ouG8/kb1LoMs7RqWSIh2ep1a9YxTiuhqVv3B+5XYRu XYJV1vzTngH4Rk+11vVjj6jycywqzUFJyD9q7M3d+q8hQP85MWyx/hbQLTM+mi+BqOBEtx Hs2hEQfb/LSB1Yq8H6/r+6+F1kssk+h3W7oY3ivnX2NmnSwf2+icHMP2x2IR1L1H9Sfy4u eTeCxytPhR9GRnCifpI6olPz+cMGvfxX/OsltEShUtTKWfKS4Fjk+prUKnvXZAuw0vjm89 T4ElXuzXxl4eM4N/3kdcXsfMDymRTJU18tRmIuG6Z/8eNS/UuVRhVIGFBa9ekA== 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=1784984878; 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=ISfBsDR0veLGi3A3Ir2aDVrRq+Gx9Y4SR4C4YYRfXVo=; b=MlZ64e/6mMFpq24qy5Kh652djbtWhjrLwDXPcLT/0NgTDyZCgRkYVxt+RzbZfM8xLCJSfU uicKsEtiLf9VzjM+7FnT6Ovixj6B1xTJgiBiwzKEC4xq+m1GJF1ijriC1oFP57Umyn4PtP WrXUXjkQQGFVjDTcAfdnwXIekeS87R4XF1RCnLvFlwDN3gB1UnQqPe3odtsfjtHqqn8IFP 1WPsCk3ucr2iXrX6r1rfB8TbTm0CLrac5tMiWkTEJH/vHJ3WPUe/gpoiuWI3ElFDOsE/iU T7aSjGoQDiVwrWgN8BOZHpMYcy4TkGpECN2Q/i5m7z90a4ZStQdPQxPR0EL/EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6lXF5b28zdfh for ; Sat, 25 Jul 2026 13:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24ab4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 13:07:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d2ce6ed7f553 - stable/15 - Makefile.inc1: Always use ${PKG_CMD} 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d2ce6ed7f553164f4f504b1a46cf06336c525674 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 13:07:57 +0000 Message-Id: <6a64b52d.24ab4.5bb8ea52@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ce6ed7f553164f4f504b1a46cf06336c525674 commit d2ce6ed7f553164f4f504b1a46cf06336c525674 Author: Lexi Winter AuthorDate: 2026-04-27 21:29:43 +0000 Commit: Lexi Winter CommitDate: 2026-07-25 13:01:23 +0000 Makefile.inc1: Always use ${PKG_CMD} Previously we had a mix of ${PKG_CMD} and bare 'pkg', which is wrong, and breaks the build when 'pkg' isn't in the tools path, e.g. when cross-building. MFC after: 2 weeks Reviewed by: wosch, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56655 (cherry picked from commit b866d05ea2860f9ccc27c75ff0501372896b5bf2) --- Makefile.inc1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 09c986d4a985..b2f491ff254b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2057,7 +2057,7 @@ _pkgbootstrap: .PHONY BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean .else - @env ASSUME_ALWAYS_YES=YES pkg bootstrap + @env ASSUME_ALWAYS_YES=YES ${PKG_CMD} bootstrap .endif .endif @@ -2119,13 +2119,13 @@ real-update-packages: stage-packages .PHONY .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/') ; \ + pkgname=$$(${PKG_CMD} query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ newpkgname=${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION}.${PKG_EXT} ; \ - oldsum=$$(pkg query -F $${pkg} '%X') ; \ + oldsum=$$(${PKG_CMD} query -F $${pkg} '%X') ; \ if [ ! -f ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ]; then \ continue; \ fi ; \ - newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ + newsum=$$(${PKG_CMD} query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ 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} ; \