From nobody Mon May 5 12:50:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrhFZ1bgRz5vSKB; Mon, 05 May 2025 12:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrhFZ03MPz3Z53; Mon, 05 May 2025 12:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746449410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrPZJvpB5dgbFkGBVodQbEqNlZOKXJ5wrKKcdcV9KRk=; b=nI8r1v6hg0gwff/x8fpfs4nB66KP9Jztot3SZ06MCDLCfIqhSsSeS4papYUx/4C/+mPLc0 NtL5HhlkjjZ/npNb+B1u8KWkFiTJPW1cBikwtRFO8e961+CALDxVVlK0bIm9rd/RmaM/Ad xhT1JEgZnx+HTUj38SFWTdu0up1XSEHvqNdAwxeNVjrLBbKqGqZKsFY8r9aC748aGFWNzI 271bTwws4xtXEZ7E0G2Hip2W2qoehddct5eBl9EROfSy8KPn2e2OIPtSj06P4M449jLrJ3 sv2eRW8920R3+M6QezscymBe4tNtWQ/VlzbcKKoYvApqPyB4ZUlkVI6WaxKjGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746449410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrPZJvpB5dgbFkGBVodQbEqNlZOKXJ5wrKKcdcV9KRk=; b=cjnRGmYw3Yh2tLJNTrZ2I5ge8zMIBOelgeDdZ5Vj2wIarYGgdhIc1TbYC4nrJdF5XFKvia 0NMHAgJWDj3uNIWKhZP14DKwRVP4oGLmUE2Oby0sKLIN+hdzcKz4A+OA5t2NwDDIA+bNp7 gdTW0tovGDkrGHs+P3aCLjRQfN4VIVCRPEKrXooTguvtPEVK+RVlZydM9gFYInYxSmiAYB AughEx19dy6zma5rqEIvLVfC4cXjFzQFi9TwwxrBlXrkxm05C2pQezmtgulHzhqsRI/00w oXY+b/O6hFvDp4ORMWki248HxXwAGEZU7Ss2nZEBjwL6/coC2FRJ0nMq8ulXXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746449410; a=rsa-sha256; cv=none; b=yGo+lMnZNQe54Wb6iEsybSBXw7pUr0VckZqyTYx9jQ2VW4yFPeNrY9rzqP77ZbqeTRLdVm YoUwX8+t++dW3iVFcHGSKznVZNO+4hX6T0xYg74uhF/SVanmSLJWyhOmjreLQoks4pLiu6 CwegF5QxLsH+o2/Xd2dknMRuveRGF1Ytw1y5Meqlrzt+TUKEAjrAQ+U7r45oQLV44CMuZV 8PaDHPK6pgXw3Tw/AglXJ1fviR7a/RKsSMQmdyP4fzSVsLl5Hr2z24AOyEKfdXijTQzA4a S9RJCKrduPIO6GE1tbYETL3b4LSm6W/kI1VATkp5PXxNtxGi+vZ8Sffohxxc+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZrhFY6WMQz1CpM; Mon, 05 May 2025 12:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545Co9vd080736; Mon, 5 May 2025 12:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545Co9Si080731; Mon, 5 May 2025 12:50:09 GMT (envelope-from git) Date: Mon, 5 May 2025 12:50:09 GMT Message-Id: <202505051250.545Co9Si080731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a9425aeb1b8f - main - release: Always create METALOG for pkg installation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9425aeb1b8fdc4888e89123edbe8c341c7ba489 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a9425aeb1b8fdc4888e89123edbe8c341c7ba489 commit a9425aeb1b8fdc4888e89123edbe8c341c7ba489 Author: Ed Maste AuthorDate: 2025-05-04 22:33:49 +0000 Commit: Ed Maste 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