From 0837b2ebd570ea092353aa3c46e374f7a1533a1d Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Thu, 30 Oct 2025 13:46:12 -0700 Subject: [PATCH] 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 0420065bb7e..68b86282699 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} != ""