From nobody Wed Nov 05 22:03:29 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 4d1zq60hgMz6Dw3G; Wed, 05 Nov 2025 22:03:30 +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 4d1zq53ynrz3KVR; Wed, 05 Nov 2025 22:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380209; 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=y1l0A2myFCGaL/TfWH35CzVuCep2NqU4+1eYmagdR14=; b=m8PqrP799cJwGIbK0gvlr5jNuQUv7jviPTT3/RZYVkqD9u0Y+Jows+QepYTESpi/pauteu 5iqPRyfDCzV33/Tj/Tsz9ENJcuC3AvegFX6ssPGLJAN82D12nb4yhV1Vj+Z/MSf7JX3QcS pFE4c+mIq9kH6Xn0Fg+mltPQLJuc1kg3lui76uBI5jBasb4zaEiMpaoGUQmZXzTqk5fMxn wmoeFSzjaKyZdsDni9qc6JwMCTPC++5SbhPWiQke0VaxgEJIZ++QiL3/QvdMODx079ztNB bYituXVhNcfHo0KCPYiRlxqdntKj978i4+PmMe0fOfDgyCzAuZqRDnBLalnizw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762380209; 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=y1l0A2myFCGaL/TfWH35CzVuCep2NqU4+1eYmagdR14=; b=a374Cxwyw2/vplVuz86jHEPPZGwf+Y9Gwqr2q+CdtmEzzbES4D/SVyYHAEk9v3U7mWu0uT bD7pyWRz3zgFsE2ab1y6NYcyfNePTjLpp0XzTUNBXZuP7qWIFIYT0eXDv5d2CUcZDg702n ylOahok0aHaBRn0VNrEY3k8AZQCwSD8W51E7zOsHbRJo2tlJ5ZwZ/Yr2oZkVRDwdB+KbpD QdFNjN/5WGsQ4tk3yOngop5+XUWIZ4Wa0/Qj2kfDsKFtdf7iG1Gta95xFeutxYb8QC5rb7 mimzzuRqpxe4iEzxxJL37ZnmJe5ByV42JHUGyzuTXu+OL1AZlEu/3YzhAHRSqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762380209; a=rsa-sha256; cv=none; b=AEnMqGcXssnficZ5Oi4Wgv6GdFxkTmRG3CVmjChSkKbV4ET3BwwJ9AuXDIYy2s05sVUuR4 JyE4gIH2SlJ7EJnjeYoaywr1eSr2sQESXxFalbf/UNhwLcdFFbxsq4pTuT3vKpzXK33/Kq n01T+V8se+dPB9LKKoyTCHKTZxPEk0+aW61ZMzJBLvCnQiCd+t+dbToxxrdEmPuRSYD7TN wK3zg8N0dyvpefH65BBJBoh5KfV2HqyAPArrdP5IroJknrEZiYN4t8UV5GO8e19O8sGCpd Cm8X1xkWupfo/lM+yfNf69RWJP8Co19PEPwsIhfIXxRb0LgzRk6jCqnacqBfpA== 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 4d1zq53TSdz1212; Wed, 05 Nov 2025 22:03:29 +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 5A5M3TYM068460; Wed, 5 Nov 2025 22:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A5M3TG0068457; Wed, 5 Nov 2025 22:03:29 GMT (envelope-from git) Date: Wed, 5 Nov 2025 22:03:29 GMT Message-Id: <202511052203.5A5M3TG0068457@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: 8105ba118be2 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 8105ba118be2c65b27deff3bd9e8ad999f8e22a9 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8105ba118be2c65b27deff3bd9e8ad999f8e22a9 commit 8105ba118be2c65b27deff3bd9e8ad999f8e22a9 Author: Colin Percival AuthorDate: 2025-11-03 01:16:19 +0000 Commit: Colin Percival CommitDate: 2025-11-05 22:03:21 +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. 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) --- 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