diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in deleted file mode 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/share/keys/%%KEYSDIR%%", - enabled: yes -} diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -13,34 +13,5 @@ UPDATE_DEPENDFILE= no FILESDIR= ${SHAREDIR}/bsdinstall -FILES= FreeBSD-base.conf - -_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH -BRANCH?= ${_BRANCH:C/-p[0-9]+$//} -_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} .include