From nobody Thu Oct 30 20:51:00 2025 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 4cyGVF0rF7z6FZg6; Thu, 30 Oct 2025 20:51:01 +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 4cyGVD4Yt8z3Gxg; Thu, 30 Oct 2025 20:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857460; 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=fHOyI6OnNr7ta8sCgs5gucglOzgOT81ITWIbQ6CG4nM=; b=di3jwB7Curg0zinc2UZrz8HoBOf4/kQJXIjPLVt4/Q+LDHikHy49e46RxzScilDbRSZwGF CRW6rmvRWOacJ0i2FOpUCjpm/d0NPOP+LKhuLSD8lapo+8dZiLrvIF+XV102FH7rBTuB1N fNDf037wHzX/Q6YlnlsjXm327Z8qtpt4QWhwGIf/BZ/DqS1DyY+Kr3N+ELMKodjSrFbm+s fHlFvBkLG9bVYGsMBefc+KklNBrMj1n2Yjxv18+HuImfHV0FFIfaMt3mdXbcjpwQDvamKf Sl+WZyuRVQ0E6p27OmyaTybGi9tePaxkmI15Ea09GgyGeUIbZk9ONlhzpfLI1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857460; 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=fHOyI6OnNr7ta8sCgs5gucglOzgOT81ITWIbQ6CG4nM=; b=qL5HY9kXTK9ECFg2zavlnbjwb0BeV9zm8Ssd7wqNTZhOzS+dirSgBOna/kmYlvDow3brC9 HTIp4tb2VtWHg95BPB9Tm2HdTjNtF4b/wXzJusrkV+P02xRudmbV4p5c9tDytUuLt1AenE eT4w/FM95Zus2lLToFlck0i0YhPjRd+0oULbegWxbVC9zTVAWblg2oig/Ka/sOsqa5x9S2 M2fri/j8k41ejJrL9HrB2u6p0TmlxxDg9PQmnZlq3b5UUDIOSY9oSHC0RyGQGW+IiXvpqW ycdTJPYWdkXLcWJF6RYtaIoRgSF0Gj4LminXoKAJ1bC3E55DvT48Qh1hDoC8AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857460; a=rsa-sha256; cv=none; b=ZkuYMAyfZS5fK6VTsTurF4z3y5igXb+sMzkdPeqADW861BzUv3fbZMzxX1LPJd9OKnhUTy A29sNcuvVjo2j2tHxil4xDcRVT2yH5MxdB9JVTqSYY+jcixw2Vk34YXCCSB1Y9qPj4BZ++ j/9+EFdQ5pEpSPtZ+ZIU57xTj8JmeGXmcil/EXLqyQHR/347MGadOzMNl12i5Wf8UlGH1Z 4HQeoW/4lQdbn2UKAW3PmRMRDa2Py4bj13xc04QpSSJ++LPdbmgo7XrzK8LMeAl1L1t3Yd CWBhB1DRaln3weQf7JGrmZFOPe0Kw8ZsBirWu9I+tqBUA3w+N+xMdVUOQcy69g== 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 4cyGVD3mdgzf79; Thu, 30 Oct 2025 20:51:00 +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 59UKp0r8043610; Thu, 30 Oct 2025 20:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKp0VT043607; Thu, 30 Oct 2025 20:51:00 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:51:00 GMT Message-Id: <202510302051.59UKp0VT043607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0837b2ebd570 - main - pkg: Die if make -V BRANCH fails 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0837b2ebd570ea092353aa3c46e374f7a1533a1d Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0837b2ebd570ea092353aa3c46e374f7a1533a1d commit 0837b2ebd570ea092353aa3c46e374f7a1533a1d Author: Colin Percival AuthorDate: 2025-10-30 20:46:12 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:50:45 +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 --- 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} != ""