From nobody Mon Nov 03 21:40:37 2025 X-Original-To: dev-commits-src-all@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 4d0lPd5WKCz6FqXS; Mon, 03 Nov 2025 21:40:37 +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 4d0lPd4lshz3XBJ; Mon, 03 Nov 2025 21:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762206037; 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=SDVVfKp2qzUknUe215igkhA5Npv4pbRi1ix53T/e1gA=; b=JrjjxAZ4hpEtgOfhdiiBwPVn/BkFPs3t6pEcUP7Vet1fli/2fQ2OgD4wU/wYHzgffYYk+8 Kwoe1xsxvzWtAl+H6lMhLkgIw8LxlHTAlpQ4H0wU4PL9iKVVKvo5duBcsNoBRmy4bg3rAe dtcpPKDPn1+bajoki9EnqnCV/OhJ8G7jOi6nW/22GfcmDClVafP+MgWyUHfJlTTwkT4ho8 DZXassPMoHCTWuzaLc8RugIY/OIoU7rIVtEvxuV7krc5vzcl/MLATV1j+mTNlruaqTxvYA dSk/IPL3CXZ956kUgFmgfakrfljkFy9BUC+NseW17+rh6QcwAeoUbWIPQxYUYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762206037; 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=SDVVfKp2qzUknUe215igkhA5Npv4pbRi1ix53T/e1gA=; b=IzdJ8MXmZizHjdCT829/MIbNFjwo72EXmTMHpEGeaFTp18jK/6ufVxcXlQfEVl8CrPvHGe TjkBSCCQxUnmtvXN5retBsglKTiPwJFh/5zd7+asDDvFRDAYMbJqUnAiQfeTXrV7XA5VgZ to1RnK251iCSqZLGpAYk4ojPkhcTYW4gZJqA6cig7lsKJ9k/LK+0a+wooNWOf8ZFu/Ndix /RtWNKy7t6G8b2MlJRXhk1yZXItcCcOXeM2+BGa+xsh/KtvDrsbdaYsIy6uu1vlsSXw+Sk 9pgUH3V+F9ajVa7/1mOrOBEs82sR+VTfFGH4IeKvC/CkZf9MuvQMuWUz/aXoQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762206037; a=rsa-sha256; cv=none; b=tkC2ZCZi/u2szQDWiRNU1FiWN9UZBPilKpQHoyZeG1cGJhWHIuNubTg0TvoejZSEcHNmf8 J6b1ljRBkKquPdgxNF44LNyw5AsU8qAPfHHGh2g86wWplKMTKqC+FGZ5j5rvT6LGofjMD2 cjYK+DZXtc+W6d+mepq8sGmt3OZCk4Mo8gQU+VbZBfUadABDgJKubfckVxIA7Tt/017N/y v5Ul2oClvw/n3DpGfjkbWfLBMQTvL8jcOzSVDSjprCvulzDtu35QFe71S8HfddJXFfCxKF G16MYqZEYgIrlmjS6fN6oB+ilmiOOJwbaZPTaEjpmh0hBiyoN2OXGfE97GOGDA== 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 4d0lPd4M3szCk4; Mon, 03 Nov 2025 21:40:37 +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 5A3Lebw1091599; Mon, 3 Nov 2025 21:40:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3LebFp091596; Mon, 3 Nov 2025 21:40:37 GMT (envelope-from git) Date: Mon, 3 Nov 2025 21:40:37 GMT Message-Id: <202511032140.5A3LebFp091596@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: 6a13aeac3c1f - main - vmimage.subr: pkg autoremove after pkg install List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6 commit 6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6 Author: Colin Percival AuthorDate: 2025-11-03 01:16:19 +0000 Commit: Colin Percival CommitDate: 2025-11-03 21:40:17 +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 --- 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