diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2025-11-25 19:33:22 -0800 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2025-11-26 17:57:20 -0800 |
| commit | f73d78e3ff1295d3227849ac993d4b2e5f206d6d (patch) | |
| tree | e11cc6dabc98958d2514997eb94e2958d1982bcb | |
| parent | c7ccd5b3f879373100ba6ca09468e8a6a7836049 (diff) | |
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)
| -rw-r--r-- | usr.sbin/bsdinstall/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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} |