git: d45816f369eb - main - bsdinstall: Ignore -p[0-9]+ in determining BRANCH

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Wed, 26 Nov 2025 17:07:33 UTC 
The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=d45816f369eb0099fd274fee23a3bf137ee794b1

commit d45816f369eb0099fd274fee23a3bf137ee794b1
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-11-26 03:33:22 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-11-26 17:07:24 +0000

    bsdinstall: Ignore -p[0-9]+ in determining BRANCH
    
    The patch level is not part of the branch per se and should not be
    used in constructing the FreeBSD-base.conf file used by bsdinstall.
    
    MFC after:      1 day
---
 usr.sbin/bsdinstall/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index 9a6b25fc5c7a..a576f2d0794e 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -16,7 +16,7 @@ FILESDIR=	${SHAREDIR}/bsdinstall
 FILES=		FreeBSD-base.conf
 
 _BRANCH!=	${MAKE} -C ${SRCTOP}/release -V BRANCH
-BRANCH?=	${_BRANCH}
+BRANCH?=	${_BRANCH:C/-p[0-9]+$//}
 _REVISION!=	${MAKE} -C ${SRCTOP}/release -V REVISION
 REVISION?=	${_REVISION}