git: 90cbdfa9dda1 - releng/15.0 - bsdinstall: Use pkgbase release URL for BETA/RC

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Wed, 22 Oct 2025 20:15:22 UTC

The branch releng/15.0 has been updated by cperciva:

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

commit 90cbdfa9dda1d66d12220dac392a7e49e304abd2
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-10-20 12:38:03 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-22 20:12:15 +0000

    bsdinstall: Use pkgbase release URL for BETA/RC
    
    Approved by:    re (cperciva)
    PR:             290238
    Reviewed by:    ivy
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D53214
    
    (cherry picked from commit 604b6458f3f327206a56da7ba80c2df7965a0761)
---
 usr.sbin/bsdinstall/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index e5bb3197fa05..5d7be97ed7cf 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -22,7 +22,8 @@ REVISION?=	${_REVISION}
 
 .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE
 SUBURL=		base_latest
-.elif ${BRANCH} == RELEASE
+.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \
+    ${BRANCH:C/[0-9]+$//} == RC
 SUBURL=		base_release_${REVISION:C/[0-9]+\.//}
 .else
 .warning Invalid branch "${BRANCH}"