Date: Thu, 27 Nov 2025 01:57:47 +0000 From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f73d78e3ff12 - releng/15.0 - bsdinstall: Ignore -p[0-9]+ in determining BRANCH Message-ID: <6927b01b.2a801.3cca8d7@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f73d78e3ff1295d3227849ac993d4b2e5f206d6d commit f73d78e3ff1295d3227849ac993d4b2e5f206d6d Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-11-26 03:33:22 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2025-11-27 01:57:20 +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. Approved by: re (cperciva) MFC after: 1 day (cherry picked from commit d45816f369eb0099fd274fee23a3bf137ee794b1) (cherry picked from commit 56275b7b06726aa530c1bcab176d225d5d4b7893) --- 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}help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6927b01b.2a801.3cca8d7>