From nobody Wed May 14 12:54:37 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 4ZyCwY3RKrz5wfl4; Wed, 14 May 2025 12:54:37 +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 4ZyCwY2Dwsz3n3w; Wed, 14 May 2025 12:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747227277; 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=xrWzMoSBazMOmkTZuLFOrxeCWR7WC2npHWBj29EG8Pk=; b=Fp6BRLVHIFit1Zmbv+4YHyVd0kOsShz3BgbePQJoI/Z9Mmu6uiwIubEaunlkPaMkWrTrqv aqXcTz0UN+SORvkpadCstwz4Jeh26DkMApCnI4hA618w7RPTPPUEHGl0BPRGGUMZODZF+q wLV57dL7ODOlq0yuLeXzElOs+BYSWYUdzPhazGtGYSOmnPYsHm8oMvgLUwwGARHczKBxVi n4YIGRXaO/HXYpFGiYjAyxFpY3MhL5K3AecmB4pBBOGJvLgPmXLhl1aa7V6zqwWj764u+V sMTRjENf1HQUfe8rqCcGXSMCy4+0XwxS+as7OYiqy10DkvD6NFytvK/r0HJQGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747227277; 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=xrWzMoSBazMOmkTZuLFOrxeCWR7WC2npHWBj29EG8Pk=; b=wv7zbjrYLO7BFiSED5hQPMKw3WH5h+bo2fL9vf7zoqMFrvCVVHmC4WnX4baYeLYRt17t88 abv9fLdNOQGQLtlFhiGgFoBTy7CUrNkl0Zs7QQz900BdVz18eTuvfd55ywbRNJMXHJ3Qjh sP+aH/X4j+YG1ZAkuoNA1NAPCJ6w4Cd5LKysSLoafzLUKtIWQs9kVjeMGyRLZxy2q3VdvM iPAslG2zVDOpQWzzLjH1p0qyJMRWnbVCFTcnsAuE4e7/HeblTlws4hE4Z7eN6B+svKkdNd o+lNBPRkX65ezeYjM46iO/CklgdazATXrx/wuVakkRbt/hpjnigcQAz51lFJVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747227277; a=rsa-sha256; cv=none; b=uWudlCDwD9X1qxTgYR1LVbwJX1bUefRlM3juZt0ZFv1pVHe+l5NSaKAtehC6XyB+W48n5u 1nLaTWV+ftRQUWkn7EMG/tZI0d41PSZFV3kcDj8VYfGfCthUXkkliCZkMPNZKxuUd8i1ea OhRixbdBZabCI1VL0HeQWFTGt+IDJJKmEgpLqp238SrKV9BgCb4T5T1htGAumY4We2asCZ teOGGgbPJIJ76GrNmyR/+VhmNReDtY1ngdpTwstnuS64SU96PxJjRqYmp5YhKWG0pNyPOo AzhDzrqlaTTWxKJmwK+35Ik358L908z1AA33kFES4CsfF0A/EZPrfZcF4WZTQQ== 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 4ZyCwY1hlqzZS9; Wed, 14 May 2025 12:54:37 +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 54ECsbdc091082; Wed, 14 May 2025 12:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ECsb0N091079; Wed, 14 May 2025 12:54:37 GMT (envelope-from git) Date: Wed, 14 May 2025 12:54:37 GMT Message-Id: <202505141254.54ECsb0N091079@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: 1203e7b1f05b - main - release: Use pkg install -f 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: 1203e7b1f05b49d95bf44801ddc1ab7e6a9eeb97 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1203e7b1f05b49d95bf44801ddc1ab7e6a9eeb97 commit 1203e7b1f05b49d95bf44801ddc1ab7e6a9eeb97 Author: Isaac Freund AuthorDate: 2025-05-11 02:48:46 +0000 Commit: Ed Maste CommitDate: 2025-05-14 12:24:45 +0000 release: Use pkg install -f Without -f, pkg will not write to the METALOG file if the packages are already installed from a previous build, causing the packages to not be included in the final install media. Official builds start with a clean target directory and won't encounter an issue, but this change supports iteration in development of the release targets. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50344 --- release/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 72df23bfa52b..1a64c51d3400 100644 --- a/release/Makefile +++ b/release/Makefile @@ -76,7 +76,9 @@ PKG_ENV+= INSTALL_AS_USER=yes 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 +# Pass -f to make sure pkg writes to the METALOG even if the package +# is already installed from a previous build +PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install -f PKG_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} clean -a .endif