From nobody Thu Oct 30 20:53:43 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 4cyGYN3QWgz6Fb3L; Thu, 30 Oct 2025 20:53:44 +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 4cyGYN0rgkz3JLg; Thu, 30 Oct 2025 20:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857624; 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=6nh8vKmluyxyiOU1u9cCGr+TH1TANYdK9ByQ0lL9NsA=; b=OBLG6B8wLPpoiCSOjC/o/JTDS3A27Ta88grSZwFe0oQupiXDHJ3Th9oFUxi3EqZ825HWxI u0dyphpkTFJLP2n20aCqudXQ2J56ByHtyv1OVDGge6zGJXtXNW9qg2s6rlJUCN4AGLXf7C twOzM7NCHahyguHhjv3uml3+e69RBQmDYbaqNdwAJPCDZYYfgs7h+I/7Lcy5SXUil6C4jd zKY/CF0rxvXa6gpmJTOsUHf4ed2bUKKrjZFp+R5X4ospdaxbK3yOyoSpjh9yl5Wmdc+miZ bY0Ifh4eEporZmr1IF1fSgEYftHSTKujjJvTsjyWt3xqNJIg0MsdTvkUxh5SlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857624; 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=6nh8vKmluyxyiOU1u9cCGr+TH1TANYdK9ByQ0lL9NsA=; b=ZtplxQPqZ9GuzkMvZqm5UAFZZk+DXr9zRDjQrJso3Zk1Vc3ozVreh8nAMqgqJieNvo0V2C I8ezzvgbZZeyxVSBpELRDRna2lGfgf80Z4AcUI1vqDCW+0JbVmJxW3BPCCJV27OKVUX1Oq ngY6TSzGFZ45lyKd+4FQRbHCfRNv4PIgdGp+u/fXGCuZnIfY7I1KmLB5i3wXQGHGmj1oUc C3FoKnE7BWSab1TwJOUTZY+rMndUqqu0pSAwSbBw4ypbvttGRtXB2sgIPBwpADsUS2cgs8 4qiP41BoLnIY/LLH8KH3+3CJdBtjca8nte43EgVvbrmQd0/noS5hvDyXpjQgeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857624; a=rsa-sha256; cv=none; b=F391BZ+QphOWBcox8SK9DMdXrWS8b8DVrircl/cFV+C4mGMPYRDMccMEqBOlZWUNNptnNn 20cvyWtI3Mj0Wc6Cm8v+2w0vBKEbLpBeY5r3iP+e0+Xfghig57Uy8DrIGl7RNcLYxt3j0b dF9Lso+j0+/Q9ovtr3i1eFge3jrNiSEQfJ1JQxmjyo7sKF1lJUCJMtniTJCw9IDfZI+NHW Y9DJiEXY5bajyjZlX00tulO1MolECLGX/ptZbXn5QnrK+XtIPj9+ziuJopf3JBmQdov3fQ NV/iKZmwbANtmy6kscUfwIJaYOi/KAAJGKKSJM4dp52+2say+hXeC87X/kZQjg== 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 4cyGYN0RXKzg22; Thu, 30 Oct 2025 20:53:44 +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 59UKrhkt049984; Thu, 30 Oct 2025 20:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKrhNY049981; Thu, 30 Oct 2025 20:53:43 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:53:43 GMT Message-Id: <202510302053.59UKrhNY049981@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: 65a3f9cf305d - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 65a3f9cf305d2f0ca463fc49c6886d6e6d867695 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=65a3f9cf305d2f0ca463fc49c6886d6e6d867695 commit 65a3f9cf305d2f0ca463fc49c6886d6e6d867695 Author: Colin Percival AuthorDate: 2025-10-30 20:46:12 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:53:30 +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 Approved by: re (cperciva) Reviewed by: ivy MFC after: 5 minutes Suggested by: ivy Differential Revision: https://reviews.freebsd.org/D53487 (cherry picked from commit 0837b2ebd570ea092353aa3c46e374f7a1533a1d) (cherry picked from commit 1f528e32f5098c5aaca9bd2fb6473631c3831fbf) --- 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} != ""