Date: Mon, 5 May 2025 12:50:09 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a9425aeb1b8f - main - release: Always create METALOG for pkg installation Message-ID: <202505051250.545Co9Si080731@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a9425aeb1b8fdc4888e89123edbe8c341c7ba489 commit a9425aeb1b8fdc4888e89123edbe8c341c7ba489 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-05-04 22:33:49 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-05-05 12:46:37 +0000 release: Always create METALOG for pkg installation We always use METALOG / non-root mode for bootonly.iso, even if not specifically requested by the user (via setting NO_ROOT ). Thus, add `-o METALOG=METALOG` to PKG_ARGS unconditionally so that the METALOG will be available when building bootonly.iso. This might result in a spurious METALOG temporarily appearing on some other release artifacts. This will be addressed once all release targets migrate to non-root mode (currently blocked on PR 283387). PR: 286528 Reviewed by: bz, cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50159 --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 65a39d500f0b..38590e364401 100644 --- a/release/Makefile +++ b/release/Makefile @@ -74,9 +74,9 @@ VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} # For installing packages into the release media. .if defined(NO_ROOT) PKG_ENV+= INSTALL_AS_USER=yes -PKG_ARGS+= -o METALOG=METALOG .endif PKG_ENV+= ASSUME_ALWAYS_YES=yes +PKG_ARGS+= -o METALOG=METALOG PKG_ARGS+= -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install PKG_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} clean -a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505051250.545Co9Si080731>