From nobody Sat Nov 15 21:41:53 2025 X-Original-To: dev-commits-src-main@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 4d86sZ1PL4z6H1rb; Sat, 15 Nov 2025 21:41:54 +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 4d86sZ0Vpbz41TT; Sat, 15 Nov 2025 21:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763242914; 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=JuV/1u/zWW0utmFFzZjtTCq4soZlw8LNdbya3bKl+As=; b=QXwhOmeeMjr+MW0GLoVJ2qR/iZKi4UVsEgCsfFEwd3Zs8tKZcmgBUdo228hlLsPLJ9Zzbz W1gp8uuRcN7tkL0yemb/Pfl+469v3tsgvhvJioqQipQCY8Ptf9G2D+bHMtRe8OvQngoJas MqrR5Sd5YByySXOvcnv4yxe0JG9jS8hPrD+T4hwL/j8uz8JzQB2RakjBovvjyqlKL2q03N +dCSXw7z2KYKoueEKtkNGNV2SuO+lC1C0UTqNv0eakGTHsPgFVxRJvxS32qZdSRtV7v8zD xgMR7us8Xg/pGGRWPqcZfs2ILY6r+eDMmHMPJ4gSxvz7xulSOkOrz0b8J6vGRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763242914; 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=JuV/1u/zWW0utmFFzZjtTCq4soZlw8LNdbya3bKl+As=; b=bbEX+gxE+XiPOIBwUuZkUARy+mGlNCHVtyyU93FrLIPf6ENnk3BlSw4/6MlMOuVPpmP/wV offj7gdWrTddcbtZMkvnHgzKezE2vAwGZKgqBoBiG/26raZ1QSh+mVTDECKtm62H+WK8im /C/xLNG4vLKbOuo2PxB2o/rm8kTFnT0dlEQgnpkb/5pLKW69TMrHCGSORCNMu3B2UiBXMy DFIHh8HqRpfrQjSeLvg4RZa3xoI8Y/SKAnnlBnwcpvC5iA8/7gQ4+6neVowYWyoaJsvjf6 OPI2TKeooi0HfUkDgnEeLoc7xyNkO7LLaIqdQ/5dsJ/6i/zFYGNiKt5XmsTkrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763242914; a=rsa-sha256; cv=none; b=szQQfVCMSLu/GNLQbSdbV6MZsYAjhyPeB/R9RJ1zdNTxCn1n2PxXDMfE3Mv6OQlAx+gvge JyQQZWfD5eYsnMQEyr1XvGS3ZQ0aJrCtXNaMabACSmCRspuv7xkfOxuXI+1H4C+38VenMZ kGhUVPkV+9kPpU3FoBXrvrcK9nFqGj9Da4/2dAe+e6KYU9rH0qsRa9ZZrt9DycL8Qjz8TF it2Xgf4VKDYI7OwY19lnDMDUwxVoRlZvSuCmisQz0d/spsGK0l4nDDIRLrt7dAQLmEEWvo s/N2QDO9/8VHyPJ5QK970jicdbY4whvzQvYwUEKZu/KyK8dpQDHIq6hKZjiBhQ== 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 4d86sZ04FRz18n7; Sat, 15 Nov 2025 21:41:54 +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 5AFLfrX7067623; Sat, 15 Nov 2025 21:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFLfrBH067620; Sat, 15 Nov 2025 21:41:53 GMT (envelope-from git) Date: Sat, 15 Nov 2025 21:41:53 GMT Message-Id: <202511152141.5AFLfrBH067620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 10a4f2d016dc - main - vmimage.subr: Log pkg/local.sqlite if pkgbase List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 10a4f2d016dccb5cfa03800bebc09a9b421c4df7 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10a4f2d016dccb5cfa03800bebc09a9b421c4df7 commit 10a4f2d016dccb5cfa03800bebc09a9b421c4df7 Author: Colin Percival AuthorDate: 2025-11-15 21:29:25 +0000 Commit: Colin Percival CommitDate: 2025-11-15 21:40:57 +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) --- 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