The branch stable/14 has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e8e2e213ab53845fe38a8220fb7fbd473255ad8e
commit e8e2e213ab53845fe38a8220fb7fbd473255ad8e
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-01-19 23:25:09 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-01-23 13:58:07 +0000
pkgbase: Fix OSVERSION specification when creating a repo
-o OSVERSION= needs to appear before the "repo" verb, otherwise it has
no effect. In this case, recent pkg-devel fails to create the repo,
saying that ABI cannot be specified without OSVERSION.
Reviewed by: kevans, manu
MFC after: 2 weeks
Fixes: 188fe88ec50e ("pkgbase: force OSVERSION")
Differential Revision: https://reviews.freebsd.org/D48518
(cherry picked from commit f9097705fb1c8d9c1f8946d1c1897d606bdbd517)
---
Makefile.inc1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index d4ec63091e5a..94f74392f4fb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2283,7 +2283,7 @@ real-sign-packages: _pkgbootstrap .PHONY
.if ${PKG_BIN_VERSION} < 11700
printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta
.endif
- @${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \
+ @${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" repo \
-m ${WSTAGEDIR}/meta \
-o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
