kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

release: Consolidate pkgbase-repo dependency

Browse source 
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
This commit is contained in:
Ed Maste 2025-06-23 10:53:02 -04:00
parent 65e2ce55b6
commit ac1408bd1d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
release/Makefile
View file

@ -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 \
@ -279,7 +284,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 \
@ -323,7 +328,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 \