diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2025-09-19 16:20:37 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2025-09-19 16:29:02 +0000 |
| commit | 060f7edadcff77cf804b60ecb25f8517c8dca62f (patch) | |
| tree | aeea8724fa2469a1510e9369a09b5058692e1b3a | |
| parent | 87a7b35f04b60956e9aa192680ae80773ec38f14 (diff) | |
pkgbase: Don't include pkg by default
We need to put pkg into the pkgbase repository for release builds, but
not for non-release pkgbase builds. Gate the contents of package-pkg
behind INCLUDE_PKG_IN_PKGBASE_REPO=YES and set that when building
releases.
Reviewed by: ivy
MFC after: 6 hours
Sponsored by: https://www.patreon.com/cperciva
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | release/Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d41741d15384..65149beb9eb6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2047,6 +2047,7 @@ update-packages: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages package-pkg: _pkgbootstrap _repodir .PHONY +.if defined(INCLUDE_PKG_IN_PKGBASE_REPO) .if exists(${PORTSDIR}) rm -rf /tmp/ports.${TARGET} || : env ${WMAKEENV} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ @@ -2055,6 +2056,7 @@ package-pkg: _pkgbootstrap _repodir .PHONY OSVERSION="${SRCRELDATE}" \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh .endif +.endif real-packages: stage-packages create-packages sign-packages .PHONY diff --git a/release/Makefile b/release/Makefile index bc04a7974744..40eea0e24a70 100644 --- a/release/Makefile +++ b/release/Makefile @@ -195,7 +195,8 @@ PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) pkgbase-repo: mkdir -p pkgbase-repo - ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo ) + ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \ + INCLUDE_PKG_IN_PKGBASE_REPO=YES ) disc1: ${PKGBASE_REPO} # Install system |