From nobody Thu Nov 06 23:11:59 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 4d2dHh1y6Sz6FtTS; Thu, 06 Nov 2025 23:12:00 +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 4d2dHh0Mr1z3h9l; Thu, 06 Nov 2025 23:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470720; 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=KysvDMmwOIEJpEDHGy/Nkc8C7m3RDtBy2W/bPkZI32c=; b=DCWgs6W1Zm/5yxdc/gWfvKZyyCGUMfsyAeRLPXR/fFx49WK1HOpHUyUFlL5j4gMVxeGsDA PRwecMlxQt7bapbGYy19CodS1kM2MQqxjrd0ihpxTC983Yx8dhCjPMASXfKGf/VsQsV6B5 xA2+UG2KFOReW0K0bEqh6ZnEdRg7ZjpzGTf1waIiSTpxlca22FJongKytNAhG+4sAV4EAv Lrsa13DidczYwd95Wdz10XUlXYLJZpPpucwfn+5EUzhstV3+L3RSk85UOIi/erPnV95rAJ aowMgCGVJk3zsJlD+kE6kDjJHQS7P8QPUFjRT8F4WVwjX5lAXKl8I5TGeW1f4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470720; 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=KysvDMmwOIEJpEDHGy/Nkc8C7m3RDtBy2W/bPkZI32c=; b=uZht5Nq0a5nQi4HCQq0sUe/3dgoQR9gfcA3nEuAd/5WuZRc7+qn96lCUPD6218wCVAF6dq nHB9vHKYzSmQTPFpoqSEOeysLOHykq6GEfx8+nrevp14tnEYzpaTJaqXIFiWKdaZsDS9kQ KICxowvApuBmO9h6Gi6mCGmqOTdGD10HA66OYEzWjTEqmvW4mIuUoM0oHvt0S6PYLRUkNt wovSk2MZkKbNYw5/olxyvGMDxCGlsbr6EYH/bRxpeTJCpmJ5bV+ylsynrVn/zgBj0rwvfF 55/fq8GgXHmrnVbhY2UP64DQ6Xpcbg/fTpUdWclGVhs4FKVv5EP9RzoO7B7KQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470720; a=rsa-sha256; cv=none; b=QO642QT3hpJV9z644Yz/cs3MFR34w+dWcsHbjq2FAUcmnWXjFZKGQD0gJlq8jnDhxl3B5U vFefE5oVahUWVWIhiUF7KP550so25EPvHssm7wAVYadg/H69HBZdVvx+HfT6YHoKlWiFfH BX0Rm+KTSQXnEVAQMAAqIMkuAnvrrO9tF67vbevb+NWFyPK9TMrgi+FFcPzmH0ci2hDC8T B7CTbdhVDY7odGZznJN/vSwH1g1RcjLs8nrB9DOUoV7/5RRbMdJVfb6/erPKVvdY/D7MGF RAwlyt1MQyqVrVcLTYXIKC7lJucdPoBLpRUZJdfCY+kIhh1YJ8PFUIDpihHIGw== 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 4d2dHg6V3YzZfg; Thu, 06 Nov 2025 23:11:59 +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 5A6NBxnw011392; Thu, 6 Nov 2025 23:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBxPP011376; Thu, 6 Nov 2025 23:11:59 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:59 GMT Message-Id: <202511062311.5A6NBxPP011376@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: f438cf7428f0 - releng/15.0 - vmimage.subr: pkg autoremove after pkg install 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: f438cf7428f0eff42e9a3acf687048275e7cc690 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f438cf7428f0eff42e9a3acf687048275e7cc690 commit f438cf7428f0eff42e9a3acf687048275e7cc690 Author: Colin Percival AuthorDate: 2025-11-03 01:16:19 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:18 +0000 vmimage.subr: pkg autoremove after pkg install A bug in pkg, which somehow only surfaced as a consequence of pkgbase, results in pkg install sometimes pulling in false dependencies. This problem might be limited to cases when the lib32 pkgbase packages are not installed. In the case of EC2 "small" images, installing the ebsnvme-id package results in binutils, gcc12-devel, gmp, indexinfo, liblz4, mpc, mpfr, and zstd packages being installed. These false dependencies are however not recorded as dependencies -- at some level pkg does understand that they're not needed -- so running pkg autoremove immediately after pkg install cleans them up. Note: This does not remove lines from METALOG corresponding to these packages, and makefs emits an error when it attempts to create the filesystem but cannot find the files listed in METALOG -- but makefs does seem to complete normally despite the error messages. This change should be reverted once the pkg issue has been located and fixed. Approved by: re (cperciva) Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53543 (cherry picked from commit 6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6) (cherry picked from commit a21cff76c57089cd357473128d42410d189ca149) --- release/tools/vmimage.subr | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3bfef585f613..8531e9b8f2d6 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -212,6 +212,13 @@ vm_extra_install_packages() { -r ${DESTDIR} \ install -y -r ${PKG_REPO_NAME} $pkg done + INSTALL_AS_USER=yes \ + ${PKG_CMD} \ + -o ABI=${PKG_ABI} \ + -o REPOS_DIR=${PKG_REPOS_DIR} \ + -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ + -r ${DESTDIR} \ + autoremove metalog_add_data ./var/db/pkg/local.sqlite else if [ -n "${WITHOUT_QEMU}" ]; then @@ -224,6 +231,8 @@ vm_extra_install_packages() { chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${p} done + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg autoremove fi return 0