From nobody Sun Nov 16 02:04:34 2025 X-Original-To: dev-commits-src-branches@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 4d8Dhg1YDBz6GjLT; Sun, 16 Nov 2025 02:04:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8Dhg0BDwz3ccC; Sun, 16 Nov 2025 02:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258675; 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=TmbwbpGiDAmZMmmg/wbwG6zeR4Q/P3oKjYTAz0VXayE=; b=IAghgKWPfzb2Hi87lXgKh/Fuw5k6Yv7hVmV4gjIqvOSN5kpmP/Jxe/AE/Z34pQcqx8IAOE cH/dGkWE0zpOKUCoIlcCMgUhI2VIvAungvBZ3+7K7JQwjoLgZ9hyPw5Q2SZxIc11E219UD JCn5xwNbNDPDA+1XT35SpTRpoFulAWgXQMzC5DB2uhcx7yVvQK/dsEnSdiXl4Qb9a0ouTq AsOU6Ymy3pinDhreALjS7uZcTIupFyDcGGLW/Pd6fTkdvK8L1aVJLyG7MfE80ZXTt+gwne FkjkF/trkEdP1m5kcHkPeVGc9in3nWFU/qkSSkBB0GSheXFbSi+zxWLXZh/7DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258675; 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=TmbwbpGiDAmZMmmg/wbwG6zeR4Q/P3oKjYTAz0VXayE=; b=bTTPXioYnE/9F5fzAtXUetsquYlx5CJHs/zFGUpCIzyNjU3cdllbQzaWu3wEbwNNUIU82P 0pfllnra0FYYBwDRIJRnF3zqUUtGqZrqlbMYfgwcG/hxSxAC8HnYucmEGaP50cNPKDpTaT yCLYdL8MYQy/5TqAC1S0tZDjaQsNrVW2XccD14EgW8DPavcoPjkJVtM7db56CtU8MIUW6x zucigO4ypN1ASMk3vCeTV01B5cdqVGpQ1AwQRxBOjxLXQFiMU8IApLo7Rww6Ipn9pnLd3l ilvmnt8Q6iXHlEV/Zhlvl35/QLvhq+ebLANz2dsW5JSeQ+zo243luvU+xi9Q5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258675; a=rsa-sha256; cv=none; b=pjmRsCGJCxLrDvQBU1kqLtt7kOKS0XX1CuwCTX/pXqPSTTuvTrk6FzRpeNG6WZZD1DaUvZ I7wD/Ttu5Y4YX+bm63FjIgvBGE6wj6TFao4/Pk/+OQhRBtunk8VpDB2Apgw5WMTpn9XU2e 0QtbK4dbM+DligSAetHtTABdbp7WHP7rBYmSVmJnTuyRsX3NKJA+KdbGG43H9h+nqZsPXI JvV8oDWCEJn+TBN/dyOzRiRalw8fDagaZAZjpi6XDTuo1y/wJHExeqJQtAXoWyM/Elktjp tysyYYUANM4QHRw4GgkZlW0l5Er/E+VMd40UDSBulPTnSP/CN3aobHJQOkmtzA== 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 4d8Dhf6cwqz3mc; Sun, 16 Nov 2025 02:04:34 +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 5AG24Ypv061017; Sun, 16 Nov 2025 02:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24YCP061014; Sun, 16 Nov 2025 02:04:34 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:34 GMT Message-Id: <202511160204.5AG24YCP061014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6b15dc234dc5 - stable/15 - vmimage.subr: Log pkg/local.sqlite if pkgbase List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6b15dc234dc56cd65f07063c1f933c214c477120 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b15dc234dc56cd65f07063c1f933c214c477120 commit 6b15dc234dc56cd65f07063c1f933c214c477120 Author: Colin Percival AuthorDate: 2025-11-15 21:29:25 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 vmimage.subr: Log pkg/local.sqlite if pkgbase We were doing this in vm_extra_install_packages but VM images without any extra packages installed would not get this installed. This results in a pkgbase system which thinks it doesn't have any packages installed (even though all the files are right there). Add a "metalog_add_data ./var/db/pkg/local.sqlite" call to the pkgbase install code path, and make the call from vm_extra_install_packages conditional on !PKGBASE. Reported by: Michael Dexter MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 10a4f2d016dccb5cfa03800bebc09a9b421c4df7) --- release/tools/vmimage.subr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 92f00f9cf7c3..482d279e5987 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -106,6 +106,7 @@ vm_install_base() { $pkg_cmd update selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected + metalog_add_data ./var/db/pkg/local.sqlite else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ @@ -219,7 +220,9 @@ vm_extra_install_packages() { -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ -r ${DESTDIR} \ autoremove - metalog_add_data ./var/db/pkg/local.sqlite + if [ -n "${NOPKGBASE}" ]; then + metalog_add_data ./var/db/pkg/local.sqlite + fi else if [ -n "${WITHOUT_QEMU}" ]; then return 0