From nobody Mon Apr 27 22:06:39 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 4g4Hhw1wHgz6Zkkq for ; Mon, 27 Apr 2026 22:06:40 +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 4g4Hhv6QVjz3hYR for ; Mon, 27 Apr 2026 22:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777327599; 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=riED4GZFbRZtqZ9KxoOI9uhiDnNhu1bakUt4gXp5dNA=; b=FjeR/6UxVwr5HbQfEmrB0mmdbkBVEoShsPi/skt2VmQUUR/hBlpbXWMEHk/7jHbNGE62cS xzkCm72ZiGc5zCg4ltMTS2euG52kGnIml5WCcFVVIMugWv4MuHSAENJPSsE3VGdr8SeSBM 04kFhgl4a8LsKNnJKXnUAXP6ZZ6tfPG90tqqkjNo/fzL2lG4VcQ7x87N4AeVNGwEGfadUw dTVw2Mx8JhrPzJtDsjciixrClr0Jpg/JROKhj9hu8NpeJVD0intsdwwjccyLYZ4ald78/B ENtfNWrtqD2aDFJfEXnsozG4Z0abZAdVr+ZF5P+u18jHcsPOo3qUgPQq91IVLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777327599; a=rsa-sha256; cv=none; b=Z+KqGHrusVwPVJaPhMf48GRIxdTx8vLQZw2gbUx+xYj/xEXkLSdEtlsrh24iMofbiSnrfy AD1/PTZZ7KNpbivnHoxafYrhJbxt8RQ+AwNzn2+nadb9tmqFUOttR/2cTUXffFq19iPAx+ PkHgIluLYOSkHoKAaWoAI5BEboWoW+A64aOnokX+lX27sOCJG5U0LgwvCrLgc4KRzQajwb ykkIrgg1V3iWMH2IkqUJzfbmbyAT3LdUI5TjnB46sK9L/QsSOMRhlv1lH4IY5NDLtsE5yR 4gU314cF4DAubqZNWNojibTgotZAD+5TKNGPt0KCfYAkcZN/TRRQ8b2kbtY7Lg== 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=1777327599; 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=riED4GZFbRZtqZ9KxoOI9uhiDnNhu1bakUt4gXp5dNA=; b=w6cCT4wOo7WYj6MexOw/uXZwdz4WHB6w1T6zKCIIAqBKlfO853bJUTbcT/nloCXq3Dqk/O rrS/C1pH7nG3gG1hqYrC9oQJD40p39X5RT7u9GJkJXQ5FrGr+4gIpmwmoL6zwjNI4mVIPS zwvmcVzl1oVg+UCXdflXS9AdapWCtM7Mz3jJanBDZi64h3LvCAPmpFkSreIQIlYcpNULFg dszqzHtonJHf3QLs3roqHJibt0hIDOSeBCFlxTz2F6VWEBAr/Zok3GSif2rMFq0hhTRV6g YCS78rM1ue6tgyZZYksdPp9jqnWdh2L7b2TFmuJhBr+w0T+byXenL1UgQeONBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4Hhv5Tf2z9dW for ; Mon, 27 Apr 2026 22:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 190cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 22:06:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: b866d05ea286 - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: b866d05ea2860f9ccc27c75ff0501372896b5bf2 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 22:06:39 +0000 Message-Id: <69efddef.190cf.4b7308e@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b866d05ea2860f9ccc27c75ff0501372896b5bf2 commit b866d05ea2860f9ccc27c75ff0501372896b5bf2 Author: Lexi Winter AuthorDate: 2026-04-27 21:29:43 +0000 Commit: Lexi Winter CommitDate: 2026-04-27 21:29:43 +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 --- Makefile.inc1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9b8cc4234ae1..dcdc735aa645 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2062,7 +2062,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 @@ -2124,13 +2124,13 @@ real-update-packages: stage-packages .PHONY .if defined(PKG_VERSION_FROM_DIR) @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} ; \