The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b44147bb12450bdf851a519d1cdc85402f89ed1f
commit b44147bb12450bdf851a519d1cdc85402f89ed1f
Author: Siva Mahadevan <m...@svmhdvn.name>
AuthorDate: 2024-10-04 22:46:09 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2025-06-13 01:21:44 +0000
Makefile.inc1: allow real-update-packages to be called independently
To perform an incremental update of a pkgbase repo, you would
call 'make update-packages', which will stage, create, and
incrementally choose newer package versions to sign as part
of a pkg repo. However, this forces you to stage the kernel
and source packages along with the world packages. For a
jail-only installation of FreeBSD, these packages are generally
not required.
This patch separates the 'update-packages' target from the
'real-update-packages' target to allow choosing world, kernel,
and/or source individually at the command line like so:
Jail-only installation:
1. make -j`nproc` buildworld
2. make PKG_VERSION='15.snap<date>' \
stage-packages-world create-packages-world \
real-update-packages
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1445
Closes: https://github.com/freebsd/freebsd-src/pull/1445
---
Makefile.inc1 | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 50efeecd5def..588f95654e99 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2031,8 +2031,8 @@ PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \
packages: .PHONY
${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages
-update-packages: .PHONY
- ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages
+update-packages: stage-packages .PHONY
+ ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} create-packages
real-update-packages
package-pkg: .PHONY
rm -rf /tmp/ports.${TARGET} || :
@@ -2044,8 +2044,7 @@ package-pkg: .PHONY
real-packages: stage-packages create-packages sign-packages .PHONY
-real-update-packages: stage-packages .PHONY
- ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages
+real-update-packages: .PHONY
.if defined(PKG_VERSION_FROM_DIR)
@echo "==> Checking for new packages (comparing ${PKG_VERSION} to
${PKG_VERSION_FROM})"
@for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \
