git: 2730e35e147c - stable/15 - release: Consolidate pkgbase-repo dependency

The branch stable/15 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=2730e35e147caaf1303bdc5ec7464a427d2480ea

commit 2730e35e147caaf1303bdc5ec7464a427d2480ea
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-06-23 14:53:02 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-03 16:50:47 +0000

    release: Consolidate pkgbase-repo dependency
    
    Use the same approach for pkgbase-repo-dir as for the packagesystem
    dependency.
    
    Reviewed by:    Isaac Freund <ifreund@freebsdfoundation.org>
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D52884
    
    (cherry picked from commit ac1408bd1d2d3f2bb2d8c77e91420fe9e66926ca)
---
 release/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 04fbeff091e7..f7ce537cb4c4 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -201,6 +201,11 @@ disc1: packagesystem
 bootonly: packagesystem
 dvd: packagesystem
 .endif
+.if !defined(NOPKGBASE) || empty(NOPKGBASE)
+disc1: pkgbase-repo-dir
+bootonly: pkgbase-repo-dir
+dvd: pkgbase-repo-dir
+.endif
 
 pkgbase-repo:
 	mkdir -p pkgbase-repo
@@ -214,7 +219,7 @@ pkgbase-repo-dir: pkgbase-repo
 	    ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \
 	    > pkgbase-repo-dir/FreeBSD-base.conf
 
-disc1: ${PKGBASE_REPO_DIR}
+disc1:
 # Install system
 	mkdir -p ${.TARGET}
 	( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
@@ -278,7 +283,7 @@ disc1: ${PKGBASE_REPO_DIR}
 	echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
 	touch ${.TARGET}
 
-bootonly: ${PKGBASE_REPO_DIR}
+bootonly:
 # Install system
 	mkdir -p ${.TARGET}
 	( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
@@ -321,7 +326,7 @@ bootonly: ${PKGBASE_REPO_DIR}
 	echo "./boot/loader.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
 	echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
 
-dvd: ${PKGBASE_REPO_DIR}
+dvd:
 # Install system
 	mkdir -p ${.TARGET}
 	( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \