From nobody Thu Oct 30 20:51:36 2025 X-Original-To: dev-commits-src-branches@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 4cyGVx15Qsz6FZcj; Thu, 30 Oct 2025 20:51:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyGVx00Znz3Hqy; Thu, 30 Oct 2025 20:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857497; 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=nhqnuHgXbj2WjnE5ukXs96k2jNLd4pgp+WC+WftygRw=; b=E9XDIkCpeXJRBUImZ5vAIBnzG09LPPKNPQnHfSbpwjem8/Mr6i/+ezqmeLXuzb1UdicNRd SN1irEvcYqCI2IhGMqxxuxxn8y6BjMCvvZM879fDH0icAKnXlaUjZKEy4ytfUDC1kGEW6w p2KyqzUNccMDzd18yoblo9DrKeH64Y+RpxLJZ+6X0nLjv0WlD513hcJ942kapockWi317X M33fehCfyttdiSN3Qh9186gfmJOYBoRmsfvw3jdKDQxfluKNiCjAtKD4OrbG2g0gOdnXq+ WBNoR8sjlSkumP1Rqf1z46pD0CmdBjYEEp8tZS1i+1GNGrl5lYgBTA5WZgvmNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857497; 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=nhqnuHgXbj2WjnE5ukXs96k2jNLd4pgp+WC+WftygRw=; b=ShxWbLl35tZ53uVmXoRduYLKx3W/UyJRpFa4DN4TrpOZeYTQsZB8lkWd4U0xEUtyt31XoF 7ZEbZLsYjEM2+ZVNhDvAlzK8LU8siu3suJlrNs4fwsKsmuwFkMC7Y0ZUb4bAZOyrQkMi3L JGjppXw54+m1xkP7izf9as4F+IPlUeyLGFm8QfkCTB6s9qvC2Mq3rEmmx6JdYBd2o8rUgQ TAqBUc6eHaqEF9M78SrhfQYJvucCw5bQcYE+9iGg9T2aOJlJDyJt5TJiJ+XbgHZqXFX3+1 nMtN3seg8X65nhAdjGSv17/68f0TYkrnzVWQ04Jk4c4WNfRYxyKh+wARf2r58Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857497; a=rsa-sha256; cv=none; b=ytoU7a4Jiu1ATJVuMAq9MLi+GUYCmMV++oPevt3KAYnT5g5E1TDcGP0JxlcAntklKiEYe8 ns8yKdjWAcHCdi6V5KWwO56liXtMr17xNud74YNS9YR2yUu7qoGWtKJVmciEIgTcaERPSA y8XFYO4x7nnYxvXhEKONwd0pYnNh/Ux9q50DY5dpvgK63HhGCIVehfeT2kf5G4oVmw36LF dapN4dVnYqMTa8leh1/CaDE96EeH0Jc5AEqocNSCWJ+rXm8Xg7i/ezgBLN6ZfzRSZSAD+W Ix+gMbpI8eEWSZLRrmJtV/bsSq+tfYL+dpnn+czp4twZKgpYi2LSkwP3j4TFSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyGVw6cYrzdkY; Thu, 30 Oct 2025 20:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59UKpaoV043949; Thu, 30 Oct 2025 20:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKpaep043946; Thu, 30 Oct 2025 20:51:36 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:51:36 GMT Message-Id: <202510302051.59UKpaep043946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1f528e32f509 - stable/15 - pkg: Die if make -V BRANCH fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f528e32f5098c5aaca9bd2fb6473631c3831fbf Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1f528e32f5098c5aaca9bd2fb6473631c3831fbf commit 1f528e32f5098c5aaca9bd2fb6473631c3831fbf Author: Colin Percival AuthorDate: 2025-10-30 20:46:12 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:51:31 +0000 pkg: Die if make -V BRANCH fails If build logic breaks such that we can't figure out which branch we're on, we should error out rather than shipping a default (and probably wrong) /etc/pkg/FreeBSD.conf Reviewed by: ivy MFC after: 5 minutes Suggested by: ivy Differential Revision: https://reviews.freebsd.org/D53487 (cherry picked from commit 0837b2ebd570ea092353aa3c46e374f7a1533a1d) --- usr.sbin/pkg/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 0420065bb7eb..68b862826992 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -1,5 +1,6 @@ PACKAGE= pkg-bootstrap +.MAKEFLAGS: -W _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH BRANCH?= ${_BRANCH} .if ${BRANCH:MCURRENT} != ""