git: 65a3f9cf305d - releng/15.0 - pkg: Die if make -V BRANCH fails
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Oct 2025 20:53:43 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=65a3f9cf305d2f0ca463fc49c6886d6e6d867695
commit 65a3f9cf305d2f0ca463fc49c6886d6e6d867695
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-30 20:46:12 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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} != ""