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:		188fe88ec5 ("pkgbase: force OSVERSION")
Differential Revision:	https://reviews.freebsd.org/D48518

This commit is contained in:

Mark Johnston

2025-01-19 23:25:09 +00:00

parent 90670e0e27

commit f9097705fb

1 changed files with 1 additions and 1 deletions

									
										Makefile.inc1
									
		+1
		-1
	
												View File
												
				@@ -2362,7 +2362,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} \