From nobody Sun Nov 16 03:12:05 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 4d8GBZ2t1Tz6GpdK; Sun, 16 Nov 2025 03:12:06 +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 4d8GBY2ShGz3n9N; Sun, 16 Nov 2025 03:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262725; 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=qBSuEkomslDX8jgl6WAhJBTSNjAxozUzyt9/R2q1Z80=; b=SuafWesOQo8DSHzI2DeXLmajW8miRp3A0Yr9YdxVCHKOSNlY3rKE0uxqBKD6fIowxPNNyG Co+2yr2SklP5gfKkurYpBwpwWA68DmONVb9y7dLDeThys9SMJIcRpDHdRT/qXJL6WC4Zc0 HWRIlIh/5agcyVFS5c/oZ8JFU2NNLmg+3zzn4mI9Ok4KY3OMpjJeowDcI88weQLJoisxLu zhfD423KKRgxZTfjLXtosNoAC5jb7iR3yBcKCrS9n9cyEKMZ/+524sfmpPPSDsdMFbliQp EPb7yDTKuIq4dGl7+vCi8uK7CMqNTXKaRoIezooAg9skqk3C0ReXp9SzEAX36w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262725; 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=qBSuEkomslDX8jgl6WAhJBTSNjAxozUzyt9/R2q1Z80=; b=a6N8RQF0mPszIDYxK9ro+wN+Q7iXZ5Rd6/P0Dmh6V/1jmjfg5NwwtJUFzhsOg2vuR06qGL TTYO7OE/V/t7Ryr2LZ10LTNqqSENs9gs5GN07t5igUZ9uRgBpt7qy6XoILOEKBKrl1vthK Kcxk+kx91+rM9ee2Ys3ynHElgm9bjFs0nboaYBiOvBM1DLWHBBvJQHj8RgpMAGxibCmPy8 DGhTxXf8yEazW54L1dfD7BTl7jo+b7BxQQeH7fGkhv/5kSe410xA6IzdNGRMouj3Dj34Ej Kesu1MW9gT9RzZILQt/ez/GkZu/s5QxDCVYpdmC3YOdUjGwtT7Y5EuFSQHTCYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262725; a=rsa-sha256; cv=none; b=S8fKQPzcmT7T0thozR+9tsU0CYBZh7DBW97tqZaMCzDOrltuVmdRJ7ZGCRqUvi9j6gl3nr fyrwYpT4inZFLcRdzBI8u9kOrzi8szXeu8fGIIZWZsaTxkFiuiole1MSU4FkBbmrzEONeb vc+M+cOdlMM3mySZR/wUh3FBl6o2Re/fpT/ohdIO5lq+5vAdzKbz4na9bPfZy1cl+B4IBz pFk1n4lLIWzMe/G7mSKAlOhqAvSMmEphBe8e6tSq7p3MS1qyQmzuPvUoOgsHoc3z5+roPA Q6z+Vb7tbix4bSDUea1po1dd1ad+E3kNxVWI5jmufIz+6sfGDNl8L99HXpKxxQ== 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 4d8GBY1TpKz5XF; Sun, 16 Nov 2025 03:12:05 +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 5AG3C5o9094370; Sun, 16 Nov 2025 03:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C5Cx094367; Sun, 16 Nov 2025 03:12:05 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:05 GMT Message-Id: <202511160312.5AG3C5Cx094367@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: dbe26fafc618 - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: dbe26fafc6185ef3de2f2cb7034c129e6554f6de Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe26fafc6185ef3de2f2cb7034c129e6554f6de commit dbe26fafc6185ef3de2f2cb7034c129e6554f6de Author: Colin Percival AuthorDate: 2025-11-15 21:29:25 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:14 +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. Approved by: re (cperciva) Reported by: Michael Dexter MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 10a4f2d016dccb5cfa03800bebc09a9b421c4df7) (cherry picked from commit 6b15dc234dc56cd65f07063c1f933c214c477120) --- 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