aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2025-06-16 17:14:36 +0000
committerWarner Losh <imp@FreeBSD.org>2025-06-16 17:14:36 +0000
commite4988ba172a84b35abab8ce065f2210dab70f148 (patch)
treebe22a49007efa3d2269f9804eb35d85b57c22c4f
parentbe3c2087c88463c95ff733883773a59202ba12a2 (diff)
Revert "Makefile.inc1: allow real-update-packages to be called independently"
Revert b44147bb1245. It doesn't work right since it doesn't bootstrap things quite right. It doesn't look trivial to fix, so revert until a proper solution is done (though maybe that solution is just do `make update-packages` and not document/support these other targets). Suggested by: bapt, emaste Sponsored by: Netflix
-rw-r--r--Makefile.inc17
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 97bd81f3263f..ea498a8afae4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2035,8 +2035,8 @@ PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \
packages: .PHONY
${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages
-update-packages: stage-packages .PHONY
- ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} create-packages real-update-packages
+update-packages: .PHONY
+ ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages
package-pkg: .PHONY
rm -rf /tmp/ports.${TARGET} || :
@@ -2048,7 +2048,8 @@ package-pkg: .PHONY
real-packages: stage-packages create-packages sign-packages .PHONY
-real-update-packages: .PHONY
+real-update-packages: stage-packages .PHONY
+ ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages
.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 \