bsdinstall: Always use pkg.FreeBSD.org

The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for
releases, so there is no need to point at pkgbase.FreeBSD.org.

MFC after:	3 days
This commit is contained in:
Colin Percival
2026-05-04 19:43:59 -07:00
parent 8e8d878562
commit 89b97931d6
2 changed files with 2 additions and 6 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
FreeBSD-base: {
url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%",
url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/%%KEYSDIR%%",
+1 -5
View File
@@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION
REVISION?= ${_REVISION}
.if ${BRANCH} == CURRENT || ${BRANCH} == STABLE
PKGHOST= pkg
KEYSDIR= pkg
SUBURL= base_latest
.elif ${BRANCH} == RELEASE
PKGHOST= pkgbase
KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//}
SUBURL= base_release_${REVISION:C/[0-9]+\.//}
.elif ${BRANCH:C/[0-9]+$//} == BETA || \
${BRANCH:C/[0-9]+$//} == RC
PKGHOST= pkgbase
KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//}
SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl}
.else
.warning Invalid branch "${BRANCH}"
PKGHOST= pkg
KEYSDIR= pkg
SUBURL= base_latest
.endif
FreeBSD-base.conf: FreeBSD-base.conf.in
sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET}
sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET}
.include <bsd.prog.mk>